linphone-ios/java
Sylvain Berfini 44e18649ac Merge branch 'master' into dev_vcard
Conflicts:
	build/android/Android.mk
	coreapi/CMakeLists.txt
	coreapi/Makefile.am
	coreapi/friend.c
	coreapi/linphonecore.c
	coreapi/linphonecore.h
2016-01-08 10:37:54 +01:00
..
common/org/linphone/core Merge branch 'master' into dev_vcard 2016-01-08 10:37:54 +01:00
impl/org/linphone Merge branch 'master' into dev_vcard 2016-01-08 10:37:54 +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