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 /CMakeLists.txt | |
| 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 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2db8d4f..3b1a0ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -193,6 +193,7 @@ if(LIBVNCSERVER_WITH_WEBSOCKETS) ${LIBVNCSERVER_DIR}/websockets.c ${LIBVNCSERVER_DIR}/${WSSRCS} ${COMMON_DIR}/md5.c + ${COMMON_DIR}/sha1.c ) endif(LIBVNCSERVER_WITH_WEBSOCKETS) |