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

HCoop / jackhill / guix / guix.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ffddb42 63abd1e)

author	Marius Bakke <mbakke@fastmail.com>
	Mon, 22 Oct 2018 21:07:16 +0000 (23:07 +0200)
committer	Marius Bakke <mbakke@fastmail.com>
	Mon, 22 Oct 2018 21:07:16 +0000 (23:07 +0200)
commit	c166a88dea354f0fb253e7d389e68f1b11fe1de4
tree	24719ff7ec1053c7e997afb10fe3a9bc276efddf	tree \| snapshot (tar.gz zip)
parent	ffddb42d6c510456997ee6de1c1b8026c9ce6d14	commit \| diff
parent	63abd1e2a36d48e1f8f7057a4c844b9cf5733be7	commit \| diff

Merge branch 'master' into core-updates

gnu/local.mk	diff1 \|	diff2 \|	blob \| history
gnu/packages/build-tools.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/gnome.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/linux.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/python-crypto.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/python.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/samba.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/ssh.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/tex.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/xorg.scm	diff1 \|	diff2 \|	blob \| history

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