]> git.proxmox.com Git - mirror_novnc.git/commitdiff
Merge branch 'master' into mobile
authorJoel Martin <github@martintribe.org>
Tue, 13 Sep 2011 21:53:04 +0000 (16:53 -0500)
committerJoel Martin <github@martintribe.org>
Tue, 13 Sep 2011 21:53:04 +0000 (16:53 -0500)
1  2 
include/rfb.js

diff --cc include/rfb.js
Simple merge