Jehan Monnier 1f9453fea6 Merge remote-tracking branch 'public/master' into belle-sip ... Conflicts: .cproject .project Makefile.am configure.ac coreapi/Makefile.am coreapi/callbacks.c coreapi/linphonecore.c		2012-12-19 11:13:52 +01:00
..
flexisip.conf	implement text messaging	2012-11-04 20:16:35 +01:00
liblinphone_tester.c	Merge remote-tracking branch 'public/master' into belle-sip	2012-12-19 11:13:52 +01:00
Makefile.am	first belle_sip implementation	2012-03-30 18:11:36 +02:00
marie_rc	implement presence	2012-12-13 18:05:16 +01:00
multi_account_lrc	start incomming call implemention	2012-05-11 15:42:14 +02:00
pauline_rc	implement presence	2012-12-13 18:05:16 +01:00
userdb.conf	First working version	2012-07-27 18:24:08 +02:00