Sylvain Berfini 82b74a8bb2 Merge branch 'master' into dev_vcard ... Conflicts: coreapi/friendlist.c		2016-01-29 11:41:57 +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-29 11:41:57 +01:00
Makefile.am	add missing makedile file	2013-08-20 16:58:17 +02:00