Merge branch 'new-api'

New, cleaner public API added. see: core/tox.h

This does not break anything because the old API is still there.

You are however encouraged to switch to the new API.

1 files changed, 2 insertions, 1 deletions

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 02a42849..49ca7c83 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -10,7 +10,8 @@ set(core_sources
         LAN_discovery.c
         Messenger.c
         util.c
-        ping.c)
+        ping.c
+        tox.c)
 
 set(core_headers
         DHT.h