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

HCoop / jackhill / guix / guix.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ecd1301 3e12df7)

author	Marius Bakke <mbakke@fastmail.com>
	Thu, 20 Sep 2018 11:37:58 +0000 (13:37 +0200)
committer	Marius Bakke <mbakke@fastmail.com>
	Thu, 20 Sep 2018 11:37:58 +0000 (13:37 +0200)
commit	2817ac3c18c1b1a6291c052bc61edd0947890a82
tree	9985705b35274ae1d6655be789346a98beff63de	tree \| snapshot (tar.gz zip)
parent	ecd13016517f0113016fef090782b725fd5e80ce	commit \| diff
parent	3e12df7d71547b4eca718b6b0e1fc244722dcc39	commit \| diff

Merge branch 'master' into core-updates

16 files changed:

gnu/local.mk	diff1 \|	diff2 \|	blob \| history
gnu/packages/bootloaders.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/cups.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/gnome.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/guile.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/image.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/libreoffice.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/linux.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/maths.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/perl.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/php.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/python.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/time.scm	diff1 \|	diff2 \|	blob \| history
gnu/packages/tls.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/