Merge branch 'master' into xwidget_mvp

author Joakim Verona <joakim@verona.se>

Thu, 2 Apr 2015 06:03:20 +0000 (08:03 +0200)

committer Joakim Verona <joakim@verona.se>

Thu, 2 Apr 2015 06:03:20 +0000 (08:03 +0200)
author Joakim Verona <joakim@verona.se>
Thu, 2 Apr 2015 06:03:20 +0000 (08:03 +0200)
committer Joakim Verona <joakim@verona.se>
Thu, 2 Apr 2015 06:03:20 +0000 (08:03 +0200)
diff --cc configure.ac
Simple merge
diff --cc src/emacs.c
Simple merge
diff --cc src/keyboard.c
Simple merge
diff --cc src/xterm.c
Simple merge
author	Joakim Verona <joakim@verona.se>
	Thu, 2 Apr 2015 06:03:20 +0000 (08:03 +0200)
committer	Joakim Verona <joakim@verona.se>
	Thu, 2 Apr 2015 06:03:20 +0000 (08:03 +0200)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/emacs.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/keyboard.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xterm.c	patch \|	diff1 \|	diff2 \|	blob \| history