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

HCoop / jackhill / guix / guix.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e46e957 16b0f20)

author	Mark H Weaver <mhw@netris.org>
	Tue, 20 Jun 2017 04:25:59 +0000 (00:25 -0400)
committer	Mark H Weaver <mhw@netris.org>
	Tue, 20 Jun 2017 04:25:59 +0000 (00:25 -0400)
commit	9815739e9bc5de4a4fbcc710221c2cee377664d4
tree	cbbbc05fff4acdfdb05d9b1e5ae5f5eea6fdefbd	tree \| snapshot (tar.gz zip)
parent	e46e9573855d5ee4f71db0ce77159bbc636330c1	commit \| diff
parent	16b0f205cf03eb94ef228d763d94718342027117	commit \| diff

Merge branch 'master' into core-updates

gnu/local.mk	diff1 \|	diff2 \|	blob \| history
gnu/packages/embedded.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/gnome.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/guile.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/linux.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/maths.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/python.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/tls.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/web.scm	diff1 \|	diff2 \|	blob \| history

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