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

HCoop / jackhill / guix / guix.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d9b4cbc de643f0)

author	Leo Famulari <leo@famulari.name>
	Thu, 2 Feb 2017 15:52:24 +0000 (10:52 -0500)
committer	Leo Famulari <leo@famulari.name>
	Thu, 2 Feb 2017 15:52:24 +0000 (10:52 -0500)
commit	e8c83d04e176f205b30b3d470f22ee5e1c686331
tree	30a95626ea31414a6319b93f50eea1e69b87a619	tree \| snapshot (tar.gz zip)
parent	d9b4cbc2a168ca3d248c5abf1f1d14c1808e6a20	commit \| diff
parent	de643f0c15677665acce73db9c28c5488e623633	commit \| diff

Merge branch 'master' into core-updates

12 files changed:

Makefile.am	diff1 \|	diff2 \|	blob \| history
gnu/build/activation.scm	diff1 \|	diff2 \|	blob \| history
gnu/local.mk	diff1 \|	diff2 \|	blob \| history
gnu/packages/admin.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/bootstrap.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/compression.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/databases.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/gnupg.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/linux.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/python.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/tls.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/xorg.scm	diff1 \|	diff2 \|	blob \| history

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