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

@ -18,7 +18,7 @@ endif
# also: Daemon{Linux,Win32}.cpp will be added later
DAEMON_SRC = $(COMMON_SRC) \
BOB.cpp ClientContext.cpp Daemon.cpp I2PTunnel.cpp I2PService.cpp SAM.cpp SOCKS.cpp UPnP.cpp \
HTTPServer.cpp HTTPProxy.cpp i2p.cpp
HTTPServer.cpp HTTPProxy.cpp I2PControl.cpp i2p.cpp
LIB_SRC := $(COMMON_SRC) \
api.cpp