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
..
linphone	Merge remote-tracking branch 'private/srtp'	2011-11-04 10:32:08 +01:00
.DS_Store	mv most of the code to common directory. add LinphoneCoreException specific implementation both for j2me and j2se	2010-04-30 18:00:09 +02:00