]> git.proxmox.com Git - mirror_novnc.git/commit
Merge branch 'master' into mobile
authorJoel Martin <github@martintribe.org>
Tue, 13 Sep 2011 15:14:53 +0000 (10:14 -0500)
committerJoel Martin <github@martintribe.org>
Tue, 13 Sep 2011 15:14:53 +0000 (10:14 -0500)
commit9192cbe39c51e092a9353af29b2f22383aeedb78
tree54ee60b321f305f86e33fe8af4b481e1203145ee
parent6ea8bece9b1299f51739e29dfce7c8033af58602
parent54e7cbdf8f50d3a77e70cb25491d9c2b5d40ae46
Merge branch 'master' into mobile

Conflicts:
include/rfb.js
include/rfb.js