Sylvain Berfini 1ed3fccf3a Merge branch 'master' into dev_vcard ... Conflicts: coreapi/friendlist.c java/common/org/linphone/core/LinphoneCore.java		2016-02-18 14:25:06 +01:00
..
core	Merge branch 'master' into dev_vcard	2016-02-18 14:25:06 +01:00
tools	no longer manually loas lib xml on Android	2013-04-10 17:35:51 +02:00