]> sjero.net Git - linphone/commit
Merge branch 'dev_conference'
authorSimon Morlat <simon.morlat@linphone.org>
Fri, 16 Sep 2011 19:51:26 +0000 (21:51 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Fri, 16 Sep 2011 19:51:26 +0000 (21:51 +0200)
commit6d0b58eb71a14379723140cb1859bf757b522490
tree79b5bdfcae430d954216ab22f80df15e2c822b10
parent981ddd03e436ad2fc6d9927532fd5a1ce2509ec5
parent26df0c6d83cee874790adc9af8e7a65841d8a46d
Merge branch 'dev_conference'

Conflicts:
coreapi/linphonecall.c
coreapi/linphonecore.c
java/common/org/linphone/core/LinphoneCall.java
mediastreamer2
coreapi/linphonecall.c
coreapi/linphonecore.c
coreapi/linphonecore.h
coreapi/linphonecore_jni.cc
coreapi/private.h
gtk/main.c
java/common/org/linphone/core/LinphoneCall.java
java/common/org/linphone/core/LinphoneCore.java