linphone-iphone/java
Simon Morlat 263b103154 Merge remote-tracking branch 'private/srtp'
Conflicts:
	coreapi/linphonecore.c
	coreapi/linphonecore.h
	coreapi/sal_eXosip2.c
	java/common/org/linphone/core/LinphoneCore.java
	oRTP
2011-11-04 10:32:08 +01:00
..
common/org Merge remote-tracking branch 'private/srtp' 2011-11-04 10:32:08 +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
.DS_Store add android build script + linphone core java interfaces 2010-04-02 16:28:44 +02:00