Merge pull request #689 from ossman/keysym

author Samuel Mannehed <samuel@cendio.se>

Thu, 10 Nov 2016 08:36:43 +0000 (09:36 +0100)

committer GitHub <noreply@github.com>

Thu, 10 Nov 2016 08:36:43 +0000 (09:36 +0100)
author Samuel Mannehed <samuel@cendio.se>
Thu, 10 Nov 2016 08:36:43 +0000 (09:36 +0100)
committer GitHub <noreply@github.com>
Thu, 10 Nov 2016 08:36:43 +0000 (09:36 +0100)
diff --cc app/ui.js
Simple merge
diff --cc core/rfb.js
Simple merge
author	Samuel Mannehed <samuel@cendio.se>
	Thu, 10 Nov 2016 08:36:43 +0000 (09:36 +0100)
committer	GitHub <noreply@github.com>
	Thu, 10 Nov 2016 08:36:43 +0000 (09:36 +0100)
		1	2
app/ui.js	patch \|	diff1 \|	diff2 \|	blob \| history
core/rfb.js	patch \|	diff1 \|	diff2 \|	blob \| history