]> git.proxmox.com Git - mirror_novnc.git/commitdiff
projects / mirror_novnc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f2d8567 2fa565b)
Merge branch 'master' of github.com:kanaka/noVNC
authorJoel Martin <github@martintribe.org>
Thu, 15 Dec 2011 21:34:30 +0000 (15:34 -0600)
committerJoel Martin <github@martintribe.org>
Thu, 15 Dec 2011 21:34:30 +0000 (15:34 -0600)
1  2 
utils/websocket.py patch | diff1 | diff2 | blob | history

diff --cc utils/websocket.py
Simple merge
noVNC mirror