Merge branch 'master' into staging

author Marius Bakke <mbakke@fastmail.com>

Mon, 4 Sep 2017 20:34:28 +0000 (22:34 +0200)

committer Marius Bakke <mbakke@fastmail.com>

Mon, 4 Sep 2017 20:34:28 +0000 (22:34 +0200)
author Marius Bakke <mbakke@fastmail.com>
Mon, 4 Sep 2017 20:34:28 +0000 (22:34 +0200)
committer Marius Bakke <mbakke@fastmail.com>
Mon, 4 Sep 2017 20:34:28 +0000 (22:34 +0200)
diff --cc gnu/local.mk
Simple merge
diff --cc gnu/packages/compression.scm
Simple merge
diff --cc gnu/packages/gnome.scm
Simple merge
diff --cc gnu/packages/gtk.scm
Simple merge
diff --cc gnu/packages/linux.scm
Simple merge
diff --cc gnu/packages/video.scm
Simple merge
author	Marius Bakke <mbakke@fastmail.com>
	Mon, 4 Sep 2017 20:34:28 +0000 (22:34 +0200)
committer	Marius Bakke <mbakke@fastmail.com>
	Mon, 4 Sep 2017 20:34:28 +0000 (22:34 +0200)
		1	2
gnu/local.mk	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/compression.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/gnome.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/gtk.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/linux.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/video.scm	patch \|	diff1 \|	diff2 \|	blob \| history