Merge pull request #893 from CendioOssman/amt

author Samuel Mannehed <samuel@cendio.se>

Thu, 5 Oct 2017 14:59:53 +0000 (16:59 +0200)

committer GitHub <noreply@github.com>

Thu, 5 Oct 2017 14:59:53 +0000 (16:59 +0200)
author Samuel Mannehed <samuel@cendio.se>
Thu, 5 Oct 2017 14:59:53 +0000 (16:59 +0200)
committer GitHub <noreply@github.com>
Thu, 5 Oct 2017 14:59:53 +0000 (16:59 +0200)
diff --cc core/rfb.js
Simple merge
diff --cc tests/test.rfb.js
Simple merge
diff --cc tests/test.websock.js
Simple merge
author	Samuel Mannehed <samuel@cendio.se>
	Thu, 5 Oct 2017 14:59:53 +0000 (16:59 +0200)
committer	GitHub <noreply@github.com>
	Thu, 5 Oct 2017 14:59:53 +0000 (16:59 +0200)
		1	2
core/rfb.js	patch \|	diff1 \|	diff2 \|	blob \| history
tests/test.rfb.js	patch \|	diff1 \|	diff2 \|	blob \| history
tests/test.websock.js	patch \|	diff1 \|	diff2 \|	blob \| history