Yann Diorcet 4da21ea4b0 Merge branch 'master' into belle-sip ... Conflicts: coreapi/linphonecore.h		2013-04-05 12:47:09 +02:00
..
common/org	javadoc enhancements	2013-04-03 18:16:13 +02:00
impl/org/linphone	javadoc enhancements	2013-04-03 18:16:13 +02: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