Merge pull request #771 from majestrate/websocks

merge recent features and bugfixes
This commit is contained in:
orignal 2017-01-07 14:13:42 -05:00 committed by GitHub
commit b4657a0d05
28 changed files with 1128 additions and 185 deletions

View file

@ -98,6 +98,7 @@ set (CLIENT_SRC
"${CMAKE_SOURCE_DIR}/HTTP.cpp"
"${CMAKE_SOURCE_DIR}/HTTPProxy.cpp"
"${CMAKE_SOURCE_DIR}/I2CP.cpp"
"${CMAKE_SOURCE_DIR}/WebSocks.cpp"
)
if(WITH_WEBSOCKETS)