Merge branch 'master' into xwidget_mvp

author Joakim Verona <joakim@verona.se>

Wed, 18 Feb 2015 15:29:20 +0000 (16:29 +0100)

committer Joakim Verona <joakim@verona.se>

Wed, 18 Feb 2015 15:29:20 +0000 (16:29 +0100)
author Joakim Verona <joakim@verona.se>
Wed, 18 Feb 2015 15:29:20 +0000 (16:29 +0100)
committer Joakim Verona <joakim@verona.se>
Wed, 18 Feb 2015 15:29:20 +0000 (16:29 +0100)
diff --cc configure.ac
Simple merge
diff --cc src/keyboard.c
Simple merge
diff --cc src/xterm.c
Simple merge
author	Joakim Verona <joakim@verona.se>
	Wed, 18 Feb 2015 15:29:20 +0000 (16:29 +0100)
committer	Joakim Verona <joakim@verona.se>
	Wed, 18 Feb 2015 15:29:20 +0000 (16:29 +0100)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/keyboard.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xterm.c	patch \|	diff1 \|	diff2 \|	blob \| history