merge in testing branch

author Michael D. Lowis <mike.lowis@gentex.com>

Thu, 6 Jun 2019 16:42:21 +0000 (12:42 -0400)

committer Michael D. Lowis <mike.lowis@gentex.com>

Thu, 6 Jun 2019 16:42:21 +0000 (12:42 -0400)
author Michael D. Lowis <mike.lowis@gentex.com>
Thu, 6 Jun 2019 16:42:21 +0000 (12:42 -0400)
committer Michael D. Lowis <mike.lowis@gentex.com>
Thu, 6 Jun 2019 16:42:21 +0000 (12:42 -0400)
diff --cc TODO.md
Simple merge
diff --cc src/lib/x11_gc.c
Simple merge
author	Michael D. Lowis <mike.lowis@gentex.com>
	Thu, 6 Jun 2019 16:42:21 +0000 (12:42 -0400)
committer	Michael D. Lowis <mike.lowis@gentex.com>
	Thu, 6 Jun 2019 16:42:21 +0000 (12:42 -0400)
		1	2
TODO.md	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib/x11_gc.c	patch \|	diff1 \|	diff2 \|	blob \| history