Sandrine Avakian 710c416e0a Merge commit '77913a3c5e3aace6ab48b78383c011d50c6bec3c' into dev_loc ... # Conflicts: # coreapi/bellesip_sal/sal_op_call.c # coreapi/callbacks.c # mediastreamer2 # oRTP		2017-04-04 14:50:10 +02:00
..
linphone	Merge commit '77913a3c5e3aace6ab48b78383c011d50c6bec3c' into dev_loc	2017-04-04 14:50:10 +02:00
MSVC	Include stdint.h and inttypes.h to build with Visual Studio.	2015-03-06 11:40:14 +01:00
sal	Merge commit '77913a3c5e3aace6ab48b78383c011d50c6bec3c' into dev_loc	2017-04-04 14:50:10 +02:00
CMakeLists.txt	Change the account creator API so that it is wrapper-friendly.	2017-03-31 11:52:26 +02:00
Makefile.am	Move public header files in the include/linphone directory.	2016-11-15 14:41:18 +01:00