]> sjero.net Git - linphone/commit
Merge remote-tracking branch 'private/srtp'
authorSimon Morlat <simon.morlat@linphone.org>
Fri, 4 Nov 2011 09:32:08 +0000 (10:32 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Fri, 4 Nov 2011 09:32:08 +0000 (10:32 +0100)
commit263b10315472d5a6a521dd8d39edec33960b619e
treeb1afc418811dc88a43239a6357962de930d73aaf
parentffb640152e5e85fb426abf6a871316d5f2875255
parent5becaaee299415ce648e78482dca295ee57e169e
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
12 files changed:
coreapi/callbacks.c
coreapi/conference.c
coreapi/linphonecall.c
coreapi/linphonecore.c
coreapi/linphonecore.h
coreapi/linphonecore_jni.cc
coreapi/private.h
coreapi/sal_eXosip2.c
gtk/parameters.ui
gtk/propertybox.c
java/common/org/linphone/core/LinphoneCore.java
oRTP