]> sjero.net Git - linphone/commit
Conferencing JNI + Android support.
authorGuillaume Beraudo <guillaume.beraudo@linphone.org>
Wed, 14 Sep 2011 08:27:11 +0000 (10:27 +0200)
committerGuillaume Beraudo <guillaume.beraudo@linphone.org>
Wed, 14 Sep 2011 08:27:11 +0000 (10:27 +0200)
commitb07b784570695a7177c92c89b8fa25cd36da088b
tree15fd502824088916d02b223bbafd564eedbb6ed5
parent0a9e2d37388439bfcdbe9d386d39a003a4ffa030
Conferencing JNI + Android support.

Conflicts:

coreapi/conference.c
coreapi/linphonecore.h
build/android/Android.mk
coreapi/conference.c
coreapi/linphonecore.h
coreapi/linphonecore_jni.cc
java/common/org/linphone/core/LinphoneCall.java
java/common/org/linphone/core/LinphoneCore.java
mediastreamer2