Margaux Clerc ee45976523 Merge remote-tracking branch 'master/master' ... Conflicts: coreapi/callbacks.c coreapi/ec-calibrator.c coreapi/friend.c coreapi/linphonecall.c coreapi/linphonecore.c coreapi/linphonecore.h coreapi/linphonefriend.h coreapi/lpconfig.c coreapi/misc.c coreapi/sal.c coreapi/upnp.c include/sal/sal.h		2015-09-07 10:32:52 +02:00
..
MSVC	Include stdint.h and inttypes.h to build with Visual Studio.	2015-03-06 11:40:14 +01:00
Makefile.am	add missing makedile file	2013-08-20 16:58:17 +02:00