Guillaume Beraudo c991f420ec Merge branch 'master' of git.linphone.org:linphone ... Conflicts: configure.ac		2013-06-25 12:42:43 +02:00
..
commands	Merge branch 'master' of git.linphone.org:linphone	2013-06-25 12:42:43 +02:00
daemon-pipetest.c	Add pipe name (allow multiple instance)	2012-04-17 11:17:05 +02:00
daemon.cc	merge patch to add a contact command and improve register command to set userid.	2013-01-15 13:05:29 +01:00
daemon.h	Some cleaning.	2012-12-12 15:37:07 +01:00
Makefile.am	merge patch to add a contact command and improve register command to set userid.	2013-01-15 13:05:29 +01:00