linphone-iphone/build/android
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
..
Android.mk repair jni compilation 2015-12-27 12:35:50 +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