Merge branch 'master' into Gtk.

author Matt Birkholz <puck@birchwood-abbey.net>

Fri, 25 Mar 2016 18:16:37 +0000 (11:16 -0700)

committer Matt Birkholz <puck@birchwood-abbey.net>

Fri, 25 Mar 2016 18:16:37 +0000 (11:16 -0700)
author Matt Birkholz <puck@birchwood-abbey.net>
Fri, 25 Mar 2016 18:16:37 +0000 (11:16 -0700)
committer Matt Birkholz <puck@birchwood-abbey.net>
Fri, 25 Mar 2016 18:16:37 +0000 (11:16 -0700)
diff --cc src/Makefile.in
Simple merge
diff --cc src/edwin/bufwin.scm
Simple merge
diff --cc src/edwin/edwin.pkg
Simple merge
diff --cc tests/check.scm
Simple merge
author	Matt Birkholz <puck@birchwood-abbey.net>
	Fri, 25 Mar 2016 18:16:37 +0000 (11:16 -0700)
committer	Matt Birkholz <puck@birchwood-abbey.net>
	Fri, 25 Mar 2016 18:16:37 +0000 (11:16 -0700)
		1	2
src/Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/edwin/bufwin.scm	patch \|	diff1 \|	diff2 \|	blob \| history
src/edwin/edwin.pkg	patch \|	diff1 \|	diff2 \|	blob \| history
tests/check.scm	patch \|	diff1 \|	diff2 \|	blob \| history