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

author Joakim Verona <joakim@verona.se>

Fri, 15 May 2015 07:57:44 +0000 (09:57 +0200)

committer Joakim Verona <joakim@verona.se>

Fri, 15 May 2015 07:57:44 +0000 (09:57 +0200)
author Joakim Verona <joakim@verona.se>
Fri, 15 May 2015 07:57:44 +0000 (09:57 +0200)
committer Joakim Verona <joakim@verona.se>
Fri, 15 May 2015 07:57:44 +0000 (09:57 +0200)
diff --cc src/Makefile.in
Simple merge
diff --cc src/window.c
Simple merge
diff --cc src/xterm.c
Simple merge
author	Joakim Verona <joakim@verona.se>
	Fri, 15 May 2015 07:57:44 +0000 (09:57 +0200)
committer	Joakim Verona <joakim@verona.se>
	Fri, 15 May 2015 07:57:44 +0000 (09:57 +0200)
		1	2
src/Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/window.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xterm.c	patch \|	diff1 \|	diff2 \|	blob \| history