Sandrine Avakian 825165d144 Merge branch 'master' of git.linphone.org:linphone into dev_msfactory ... # Conflicts: # mediastreamer2		2016-02-01 10:58:37 +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' of git.linphone.org:linphone into dev_msfactory	2016-02-01 10:58:37 +01:00
Makefile.am	add missing makedile file	2013-08-20 16:58:17 +02:00