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

HCoop / jackhill / guix / guix.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3b6f8a4 48d7ac1)

author	Marius Bakke <mbakke@fastmail.com>
	Sat, 28 Jul 2018 16:34:59 +0000 (18:34 +0200)
committer	Marius Bakke <mbakke@fastmail.com>
	Sat, 28 Jul 2018 16:34:59 +0000 (18:34 +0200)
commit	1af575f04df6cfb6e5e3f3273271383b6ee355a8
tree	0f1dfaed352dcdb9c827ed32db267bc7ed3d8203	tree \| snapshot (tar.gz zip)
parent	3b6f8a45d725dd7592634a34e8ffbc14a3bd31cc	commit \| diff
parent	48d7ac175f69fea587eaa0358eddb5c76205e8ad	commit \| diff

Merge branch 'master' into staging

12 files changed:

gnu/local.mk	diff1 \|	diff2 \|	blob \| history
gnu/packages/audio.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/databases.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/freedesktop.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/gnome.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/java.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/maths.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/pdf.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
gnu/packages/xorg.scm	diff1 \|	diff2 \|	blob \| history

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