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

HCoop / jackhill / guix / guix.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: cb4b508 6e65eb3)

author	Marius Bakke <mbakke@fastmail.com>
	Mon, 2 Jul 2018 10:18:58 +0000 (12:18 +0200)
committer	Marius Bakke <mbakke@fastmail.com>
	Mon, 2 Jul 2018 10:18:58 +0000 (12:18 +0200)
commit	92af3ce417fdcb932c3f291e0c79106466a40c66
tree	610d10ca5c4197c1a0ae14f1972dc72fb78a39d3	tree \| snapshot (tar.gz zip)
parent	cb4b508cd68df89bfbd5255a0c5569f8318ad50f	commit \| diff
parent	6e65eb3cad1d1148eade9ed2228cdea90d531a94	commit \| diff

Merge branch 'master' into staging

gnu/local.mk	diff1 \|	diff2 \|	blob \| history
gnu/packages/gcc.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/gnuzilla.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/java.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/xdisorg.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/xorg.scm	diff1 \|	diff2 \|	blob \| history

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