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
..
core	Merge remote-tracking branch 'origin/master' into dev_vcard	2015-12-30 15:17:01 +01:00
tools	no longer manually loas lib xml on Android	2013-04-10 17:35:51 +02:00