Merge remote-tracking branch 'origin/master' into qt-updates

author Efraim Flashner <efraim@flashner.co.il>

Wed, 25 Jul 2018 18:30:18 +0000 (21:30 +0300)

committer Efraim Flashner <efraim@flashner.co.il>

Wed, 25 Jul 2018 18:30:18 +0000 (21:30 +0300)
author Efraim Flashner <efraim@flashner.co.il>
Wed, 25 Jul 2018 18:30:18 +0000 (21:30 +0300)
committer Efraim Flashner <efraim@flashner.co.il>
Wed, 25 Jul 2018 18:30:18 +0000 (21:30 +0300)
diff --cc gnu/local.mk
Simple merge
diff --cc gnu/packages/display-managers.scm
Simple merge
diff --cc gnu/packages/pdf.scm
Simple merge
author	Efraim Flashner <efraim@flashner.co.il>
	Wed, 25 Jul 2018 18:30:18 +0000 (21:30 +0300)
committer	Efraim Flashner <efraim@flashner.co.il>
	Wed, 25 Jul 2018 18:30:18 +0000 (21:30 +0300)
		1	2
gnu/local.mk	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/display-managers.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/pdf.scm	patch \|	diff1 \|	diff2 \|	blob \| history