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
..
org/linphone/core	Merge branch 'master' into dev_vcard	2016-01-08 10:37:54 +01:00