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

HCoop / jackhill / guix / guix.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7da473b 1c69e4c)

author	Mark H Weaver <mhw@netris.org>
	Tue, 30 Dec 2014 17:23:32 +0000 (12:23 -0500)
committer	Mark H Weaver <mhw@netris.org>
	Tue, 30 Dec 2014 17:23:32 +0000 (12:23 -0500)
commit	8cbb67e04509f0854762269e46a65ee4344388f7
tree	c44693193709650f19ea3ec264d5ed87170508f0	tree \| snapshot (tar.gz zip)
parent	7da473b75721e06237b106c6d186f2729117b1ee	commit \| diff
parent	1c69e4ce3f33242ee8d209b8078fc78a73355446	commit \| diff

Merge branch 'master' into core-updates

gnu-system.am	diff1 \|	diff2 \|	blob \| history
gnu/packages/games.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/glib.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/gnome.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/python.scm	diff1 \|	diff2 \|	blob \| history
tests/packages.scm	diff1 \|	diff2 \|	blob \| history

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