diff options
| author | Gernot Tenchio <gernot.tenchio@securepoint.de> | 2011-08-30 12:43:08 +0200 |
|---|---|---|
| committer | Gernot Tenchio <gernot.tenchio@securepoint.de> | 2011-08-30 12:43:08 +0200 |
| commit | 3eec97655871f4b5f39e20e44336d8b3ffacd537 (patch) | |
| tree | d4017cbb6cfc5819bad8d762939f499bbc658800 /vncterm/LinuxVNC.c | |
| parent | fd73186769e00888a35067ef4c22cd668cb5d2ca (diff) | |
| parent | 7d1c1033c5ee8689fd7896b2d7fadf8bd552382b (diff) | |
| download | libtdevnc-3eec97655871f4b5f39e20e44336d8b3ffacd537.tar.gz libtdevnc-3eec97655871f4b5f39e20e44336d8b3ffacd537.zip | |
Merge branch 'kanaka/websockets' into websockets
Conflicts:
libvncserver/websockets.c
Diffstat (limited to 'vncterm/LinuxVNC.c')
0 files changed, 0 insertions, 0 deletions