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
..
MSVC	Include stdint.h and inttypes.h to build with Visual Studio.	2015-03-06 11:40:14 +01:00
sal	Merge branch 'master' into dev_vcard	2016-02-09 10:21:18 +01:00
Makefile.am	add missing makedile file	2013-08-20 16:58:17 +02:00