]> sjero.net Git - linphone/commit
Merge commit '2e953b4'
authorGuillaume Beraudo <guillaume.beraudo@linphone.org>
Mon, 13 Dec 2010 14:08:31 +0000 (15:08 +0100)
committerGuillaume Beraudo <guillaume.beraudo@linphone.org>
Mon, 13 Dec 2010 14:08:31 +0000 (15:08 +0100)
commit36493970e5109e994b8f51f537319bf3af7cea81
treef5d0fb5f7a720d87bebbc08cae64cb2ba001fb38
parent53be75eda65769dcd3b086ed953fdef70f0a5ea2
parent2e953b44c8c986251c32ce2c9c4eb2455710e44f
Merge commit '2e953b4'

Conflicts:
coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java
coreapi/linphonecore_jni.cc
coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java
coreapi/linphonecore_jni.cc
java/common/org/linphone/core/LinphoneProxyConfig.java