linphone-iphone/java
Jehan Monnier 5c230ff8d1 Merge remote-tracking branch 'public/master' into belle-sip
Conflicts:
	NEWS
	coreapi/linphonecore.c
	java/impl/org/linphone/core/LinphoneAddressImpl.java
2013-06-24 12:06:18 +02:00
..
common/org add java wrapper and jni for LinphoneEvent API 2013-06-18 22:11:36 +02:00
impl/org/linphone Merge remote-tracking branch 'public/master' into belle-sip 2013-06-24 12:06:18 +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