diff options
| author | Christian Beier <dontmind@freeshell.org> | 2011-09-20 12:19:49 +0200 |
|---|---|---|
| committer | Christian Beier <dontmind@freeshell.org> | 2011-09-20 12:19:49 +0200 |
| commit | 419641f1f96b6ffab81de017d4556a0af83558a6 (patch) | |
| tree | d4b5576462b5182b390460e706273b653099e58b /classes/novnc/include/web-socket-js/swfobject.js | |
| parent | fa458d48ec69321f9694a2cdcf147c46554bcf75 (diff) | |
| parent | d4cfc260fe7eb164f9e53dd4fb524b9fedd35c04 (diff) | |
| download | libtdevnc-419641f1f96b6ffab81de017d4556a0af83558a6.tar.gz libtdevnc-419641f1f96b6ffab81de017d4556a0af83558a6.zip | |
Merge remote branch 'kanaka/websockets' into websockets
Conflicts, resolved manually:
libvncserver/Makefile.am
Diffstat (limited to 'classes/novnc/include/web-socket-js/swfobject.js')
0 files changed, 0 insertions, 0 deletions