linphone-iphone/build/android
Sylvain Berfini 235dca249d Merge branch 'master' into dev_vcard
Conflicts:
	build/android/Android.mk
	coreapi/private.h
	java/common/org/linphone/core/LinphoneCore.java
	java/impl/org/linphone/core/LinphoneCoreImpl.java
2016-02-09 10:21:18 +01:00
..
Android.mk Merge branch 'master' into dev_vcard 2016-02-09 10:21:18 +01:00
config.h build: rename HAVE_GETTEXT with HAVE_INTL 2015-07-03 15:37:32 +02:00
liblinphone_tester.mk Merge remote-tracking branch 'origin/master' into dev_vcard 2015-12-30 15:17:01 +01:00