Merge remote-tracking branch 'origin/master' into pdumper

author Daniel Colascione <dancol@dancol.org>

Sun, 4 Mar 2018 00:55:26 +0000 (16:55 -0800)

committer Daniel Colascione <dancol@dancol.org>

Sun, 4 Mar 2018 00:55:26 +0000 (16:55 -0800)
author Daniel Colascione <dancol@dancol.org>
Sun, 4 Mar 2018 00:55:26 +0000 (16:55 -0800)
committer Daniel Colascione <dancol@dancol.org>
Sun, 4 Mar 2018 00:55:26 +0000 (16:55 -0800)
diff --cc configure.ac
Simple merge
diff --cc src/fns.c
Simple merge
diff --cc src/window.c
Simple merge
author	Daniel Colascione <dancol@dancol.org>
	Sun, 4 Mar 2018 00:55:26 +0000 (16:55 -0800)
committer	Daniel Colascione <dancol@dancol.org>
	Sun, 4 Mar 2018 00:55:26 +0000 (16:55 -0800)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/fns.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/window.c	patch \|	diff1 \|	diff2 \|	blob \| history