Merge with upstream

This commit is contained in:
Francisco Blas (klondike) Izquierdo Riera 2015-01-07 20:47:47 +01:00
commit 29039fd039
6 changed files with 54 additions and 4 deletions

View file

@ -49,6 +49,7 @@ set (DAEMON_SRC
"${CMAKE_SOURCE_DIR}/HTTPProxy.cpp"
"${CMAKE_SOURCE_DIR}/HTTPServer.cpp"
"${CMAKE_SOURCE_DIR}/I2PService.cpp"
"${CMAKE_SOURCE_DIR}/I2PControl.cpp"
"${CMAKE_SOURCE_DIR}/I2PTunnel.cpp"
"${CMAKE_SOURCE_DIR}/SAM.cpp"
"${CMAKE_SOURCE_DIR}/SOCKS.cpp"