Sylvain Berfini db7c875468 Merge remote-tracking branch 'origin/master' into dev_vcard ... Conflicts: build/android/liblinphone_tester.mk coreapi/friend.c coreapi/friendlist.c coreapi/linphonecore_jni.cc		2015-12-30 15:17:01 +01:00
..
common/org/linphone/core	Merge remote-tracking branch 'origin/master' into dev_vcard	2015-12-30 15:17:01 +01:00
impl/org/linphone	Merge remote-tracking branch 'origin/master' into dev_vcard	2015-12-30 15:17:01 +01:00
j2me/org/linphone/core	fix linphonecoreexception	2010-05-14 16:49:54 +02:00
j2se/org/linphone/core	Removed some compiler warnings.	2010-12-09 22:35:39 +01:00