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

HCoop / jackhill / guix / guix.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: aa27987 50c7a1e)

author	Mark H Weaver <mhw@netris.org>
	Sun, 19 Jul 2015 22:12:34 +0000 (18:12 -0400)
committer	Mark H Weaver <mhw@netris.org>
	Sun, 19 Jul 2015 22:12:34 +0000 (18:12 -0400)
commit	1b4e48d498a96d478baa1aae7d9c7ecdbd817d6f
tree	4b650999e49a6f4d3dd116fab3f9ee8222247e07	tree \| snapshot (tar.gz zip)
parent	aa27987f71cb8afa698ede551e20b1248f160113	commit \| diff
parent	50c7a1e297bff0935674b4f30e854a8889becfdd	commit \| diff

Merge branch 'master' into core-updates

16 files changed:

doc/guix.texi	diff1 \|	diff2 \|	blob \| history
gnu-system.am	diff1 \|	diff2 \|	blob \| history
gnu/packages/admin.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/base.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/emacs.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/gcc.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/gnome.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/haskell.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/linux.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/perl.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/python.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/tls.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/version-control.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/video.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/web.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/xdisorg.scm	diff1 \|	diff2 \|	blob \| history

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