HCoop Git - jackhill/guix/guix.git/commit

HCoop / jackhill / guix / guix.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8ab211d b4f04e0)

author	Marius Bakke <marius@gnu.org>
	Tue, 26 May 2020 20:34:46 +0000 (22:34 +0200)
committer	Marius Bakke <marius@gnu.org>
	Tue, 26 May 2020 20:34:46 +0000 (22:34 +0200)
commit	aa13c5657d4f8b5dd52beda88a9a8ccc59ebca86
tree	856094a6541a72b70d471ed5265d6e940cb11e55	tree \| snapshot (tar.gz zip)
parent	8ab211dbdb7df000a64aceadfe7b53488819d245	commit \| diff
parent	b4f04e0efff1fb6112b84dc6d36ea46215c336b2	commit \| diff

Merge branch 'master' into staging

12 files changed:

gnu/local.mk	diff1 \|	diff2 \|	blob \| history
gnu/packages/cups.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/databases.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/gl.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/graphviz.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/gtk.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/linux.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/python-web.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/python-xyz.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/syndication.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/video.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/web.scm	diff1 \|	diff2 \|	blob \| history

jackhill's copy of GNU Guix: https://guix.gnu.org/