]> sjero.net Git - linphone/commit
Merge branch 'dev_conference' of git.linphone.org:linphone-private
authorGuillaume Beraudo <guillaume.beraudo@linphone.org>
Tue, 20 Sep 2011 12:49:18 +0000 (14:49 +0200)
committerGuillaume Beraudo <guillaume.beraudo@linphone.org>
Tue, 20 Sep 2011 12:49:49 +0000 (14:49 +0200)
commit5127119c46d0ce3a87aa17f16e51687e750cbe79
treed7af6f57827b717b75fdfb67a152b25dc9682121
parent0d81459224dde55a11c83dced0eec0e11493fff9
parent038190233cba68d004c9aaead77ebef0678fd35f
Merge branch 'dev_conference' of git.linphone.org:linphone-private

Conflicts:
mediastreamer2
coreapi/linphonecore.c
coreapi/linphonecore_jni.cc
java/common/org/linphone/core/LinphoneCall.java
java/common/org/linphone/core/LinphoneCore.java
mediastreamer2