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

HCoop / jackhill / guix / guix.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e21ce0f 72687ca)

author	Mark H Weaver <mhw@netris.org>
	Fri, 5 Jan 2018 02:21:04 +0000 (21:21 -0500)
committer	Mark H Weaver <mhw@netris.org>
	Fri, 5 Jan 2018 02:21:04 +0000 (21:21 -0500)
commit	247d23680a222bc5440dec7c3fe0d36ad463a121
tree	4e3c28a2e7b0531c7883ae1c40348f1533a20c4e	tree \| snapshot (tar.gz zip)
parent	e21ce0f9040592d398668498119565d94a639a04	commit \| diff
parent	72687ca5d2d8d1dd55b152823a164606fa421d9c	commit \| diff

Merge branch 'master' into core-updates

gnu/packages/emacs.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/file.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/linux.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/python.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/