Merge branch 'master' into makefile-refactor

author Chris Hanson <org/chris-hanson/cph>

Tue, 23 Oct 2018 21:12:52 +0000 (14:12 -0700)

committer Chris Hanson <org/chris-hanson/cph>

Tue, 23 Oct 2018 21:12:52 +0000 (14:12 -0700)
author Chris Hanson <org/chris-hanson/cph>
Tue, 23 Oct 2018 21:12:52 +0000 (14:12 -0700)
committer Chris Hanson <org/chris-hanson/cph>
Tue, 23 Oct 2018 21:12:52 +0000 (14:12 -0700)
diff --cc src/x11/Makefile.am
Simple merge
diff --cc src/x11/configure.ac
Simple merge
author	Chris Hanson <org/chris-hanson/cph>
	Tue, 23 Oct 2018 21:12:52 +0000 (14:12 -0700)
committer	Chris Hanson <org/chris-hanson/cph>
	Tue, 23 Oct 2018 21:12:52 +0000 (14:12 -0700)
		1	2
src/x11/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/x11/configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history