Sandrine Avakian 67ea07bdca Merge branch 'daemon-dev' ... # Conflicts: # daemon/commands/video.cc		2017-01-02 11:10:28 +01:00
..
commands	Merge branch 'daemon-dev'	2017-01-02 11:10:28 +01:00
CMakeLists.txt	fix static compilation	2016-10-12 14:45:13 +02:00
daemon-pipetest.c	Build linphone-daemon on Windows.	2016-11-28 17:30:25 +01:00
daemon.cc	Merge branch 'daemon-dev'	2017-01-02 11:10:28 +01:00
daemon.h	Huge cleaning in linphone-daemon.	2016-11-29 18:28:26 +01:00
Makefile.am	Move public header files in the include/linphone directory.	2016-11-15 14:41:18 +01:00