Merge branch 'keyboard' of https://github.com/CendioOssman/noVNC

author Pierre Ossman <ossman@cendio.se>

Thu, 4 May 2017 10:18:55 +0000 (12:18 +0200)

committer Pierre Ossman <ossman@cendio.se>

Thu, 4 May 2017 10:18:55 +0000 (12:18 +0200)
author Pierre Ossman <ossman@cendio.se>
Thu, 4 May 2017 10:18:55 +0000 (12:18 +0200)
committer Pierre Ossman <ossman@cendio.se>
Thu, 4 May 2017 10:18:55 +0000 (12:18 +0200)
diff --cc app/error-handler.js
Simple merge
diff --cc app/ui.js
Simple merge
diff --cc core/rfb.js
Simple merge
diff --cc tests/test.rfb.js
Simple merge
author	Pierre Ossman <ossman@cendio.se>
	Thu, 4 May 2017 10:18:55 +0000 (12:18 +0200)
committer	Pierre Ossman <ossman@cendio.se>
	Thu, 4 May 2017 10:18:55 +0000 (12:18 +0200)
		1	2
app/error-handler.js	patch \|	diff1 \|	diff2 \|	blob \| history
app/ui.js	patch \|	diff1 \|	diff2 \|	blob \| history
core/rfb.js	patch \|	diff1 \|	diff2 \|	blob \| history
tests/test.rfb.js	patch \|	diff1 \|	diff2 \|	blob \| history