]> sjero.net Git - linphone/commit
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone
authorGuillaume Beraudo <guillaume.beraudo@linphone.org>
Wed, 23 Feb 2011 15:13:08 +0000 (16:13 +0100)
committerGuillaume Beraudo <guillaume.beraudo@linphone.org>
Wed, 23 Feb 2011 15:13:08 +0000 (16:13 +0100)
commitf515a560bcaa0d098df885fd1264ed5db46350e5
tree56a1e3c9d0c297b2816b248840da90fd8af5dd99
parentc0785a9ca6b3b1011962c97d8ccfb4418c2bff4d
parent5f356316a781530e9af2c2f60b268b62c6d2eef0
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone

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