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
..
Android.mk	Merge branch 'master' into dev_vcard	2016-01-08 10:37:54 +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