Sylvain Berfini 4583352bad Merge branch 'master' into dev_vcard ... Conflicts: coreapi/Makefile.am coreapi/conference.h		2016-01-18 11:14:56 +01:00
..
common/org/linphone/core	Merge branch 'master' into dev_vcard	2016-01-18 11:14:56 +01:00
impl/org/linphone	Merge branch 'master' into dev_vcard	2016-01-18 11:14:56 +01:00
j2me/org/linphone/core	fix linphonecoreexception	2010-05-14 16:49:54 +02:00
j2se/org/linphone/core	Removed some compiler warnings.	2010-12-09 22:35:39 +01:00