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

author Joakim Verona <joakim@verona.se>

Wed, 13 May 2015 13:13:34 +0000 (15:13 +0200)

committer Joakim Verona <joakim@verona.se>

Wed, 13 May 2015 13:13:34 +0000 (15:13 +0200)
author Joakim Verona <joakim@verona.se>
Wed, 13 May 2015 13:13:34 +0000 (15:13 +0200)
committer Joakim Verona <joakim@verona.se>
Wed, 13 May 2015 13:13:34 +0000 (15:13 +0200)
diff --cc configure.ac
Simple merge
diff --cc src/Makefile.in
Simple merge
diff --cc src/keyboard.c
Simple merge
author	Joakim Verona <joakim@verona.se>
	Wed, 13 May 2015 13:13:34 +0000 (15:13 +0200)
committer	Joakim Verona <joakim@verona.se>
	Wed, 13 May 2015 13:13:34 +0000 (15:13 +0200)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/keyboard.c	patch \|	diff1 \|	diff2 \|	blob \| history