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

HCoop / jackhill / guix / guix.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 55174e6 cee9ab2)

author	Marius Bakke <mbakke@fastmail.com>
	Fri, 9 Nov 2018 16:02:08 +0000 (17:02 +0100)
committer	Marius Bakke <mbakke@fastmail.com>
	Fri, 9 Nov 2018 16:02:08 +0000 (17:02 +0100)
commit	64461ba20a07a0cf3197de3e97cb44e0f66cebdc
tree	f48fd8e66879da30d5e2d89b16de6294ecd1192d	tree \| snapshot (tar.gz zip)
parent	55174e668f2985d1c4efda4fbf58f4061dde0db2	commit \| diff
parent	cee9ab244f9ba9f3156b6aa50927418bae951096	commit \| diff

Merge branch 'master' into core-updates

gnu/local.mk	diff1 \|	diff2 \|	blob \| history
gnu/packages/cups.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/databases.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/gtk.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/guile.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/maths.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/music.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/python.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/statistics.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/xml.scm	diff1 \|	diff2 \|	blob \| history

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