Guillaume Beraudo 36493970e5 Merge commit '2e953b4' ... Conflicts: coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java coreapi/linphonecore_jni.cc		2010-12-13 15:08:31 +01:00
..
common/org	Merge commit '2e953b4'	2010-12-13 15:08:31 +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