linphone-iphone/java/impl/org
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
..
linphone Merge remote-tracking branch 'origin/master' into dev_vcard 2015-12-30 15:17:01 +01:00