Sylvain Berfini 4583352bad Merge branch 'master' into dev_vcard ... Conflicts: coreapi/Makefile.am coreapi/conference.h		2016-01-18 11:14:56 +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-01-18 11:14:56 +01:00
Makefile.am	add missing makedile file	2013-08-20 16:58:17 +02:00