diff options
| author | Christian Beier <dontmind@freeshell.org> | 2012-04-25 12:55:03 +0200 |
|---|---|---|
| committer | Christian Beier <dontmind@freeshell.org> | 2012-04-25 12:55:03 +0200 |
| commit | 413ca0dfef83b98f7b230e0596ac086d42eaad4e (patch) | |
| tree | b36ca82ac24402f3f0f5a7085f0561757e7b56f5 /libvncserver/websockets.c | |
| parent | 2524573678fbdb195cbc9ba2f92e0f58c205ad10 (diff) | |
| parent | 1df6bffd9e7ff5106ffb5f3bc1938a14ea1f72cf (diff) | |
| download | libtdevnc-413ca0dfef83b98f7b230e0596ac086d42eaad4e.tar.gz libtdevnc-413ca0dfef83b98f7b230e0596ac086d42eaad4e.zip | |
Merge branch 'turbovnc'
Conflicts, resolved manually:
AUTHORS
Diffstat (limited to 'libvncserver/websockets.c')
0 files changed, 0 insertions, 0 deletions