]> sjero.net Git - linphone/commit
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone
authorJehan Monnier <jehan.monnier@linphone.org>
Thu, 25 Nov 2010 13:00:06 +0000 (14:00 +0100)
committerJehan Monnier <jehan.monnier@linphone.org>
Thu, 25 Nov 2010 13:00:06 +0000 (14:00 +0100)
commita9db49b15aee38098d23086fd574adb99a1afda3
tree47478a2f5f734111a5f8e966a319b5b29b1f9fd3
parent1e195e86b944c7ee5822146195c0767360cad78c
parent78c6a9d07a853f9730ee9e87dd4721f1852e0a23
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone

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