Simon Morlat 6d0b58eb71 Merge branch 'dev_conference' ... Conflicts: coreapi/linphonecall.c coreapi/linphonecore.c java/common/org/linphone/core/LinphoneCall.java mediastreamer2		2011-09-16 21:51:26 +02:00
..
common/org	Merge branch 'dev_conference'	2011-09-16 21:51:26 +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
.DS_Store	add android build script + linphone core java interfaces	2010-04-02 16:28:44 +02:00