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

author Pierre Ossman <ossman@cendio.se>

Wed, 18 Oct 2017 13:12:46 +0000 (15:12 +0200)

committer Pierre Ossman <ossman@cendio.se>

Wed, 18 Oct 2017 13:12:46 +0000 (15:12 +0200)
author Pierre Ossman <ossman@cendio.se>
Wed, 18 Oct 2017 13:12:46 +0000 (15:12 +0200)
committer Pierre Ossman <ossman@cendio.se>
Wed, 18 Oct 2017 13:12:46 +0000 (15:12 +0200)
diff --cc app/ui.js
Simple merge
diff --cc core/rfb.js
Simple merge
diff --cc vnc.html
Simple merge
author	Pierre Ossman <ossman@cendio.se>
	Wed, 18 Oct 2017 13:12:46 +0000 (15:12 +0200)
committer	Pierre Ossman <ossman@cendio.se>
	Wed, 18 Oct 2017 13:12:46 +0000 (15:12 +0200)
		1	2
app/ui.js	patch \|	diff1 \|	diff2 \|	blob \| history
core/rfb.js	patch \|	diff1 \|	diff2 \|	blob \| history
vnc.html	patch \|	diff1 \|	diff2 \|	blob \| history