]> git.proxmox.com Git - mirror_novnc.git/commit
Merge branch 'master' of https://github.com/kanaka/noVNC into ctrlalttabesc
authorsamhed <samuel@cendio.se>
Fri, 11 Oct 2013 15:20:49 +0000 (17:20 +0200)
committersamhed <samuel@cendio.se>
Fri, 11 Oct 2013 15:20:49 +0000 (17:20 +0200)
commitf4f72e9db99c80ca12904a4edf363bec53f01fc8
tree85ee3b444cf4705bca2f76a509c36f29484392cd
parentb4a979a07e6c4177015b7aaf74b53f9bdc9a55c6
parent69127447acedbf499f95a037ad0d048b222d3d47
Merge branch 'master' of https://github.com/kanaka/noVNC into ctrlalttabesc

Conflicts:
include/ui.js
vnc.html
include/ui.js
vnc.html