]> sjero.net Git - linphone/commit
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone
authorJehan Monnier <jehan.monnier@linphone.org>
Fri, 10 Sep 2010 13:14:56 +0000 (15:14 +0200)
committerJehan Monnier <jehan.monnier@linphone.org>
Fri, 10 Sep 2010 13:14:56 +0000 (15:14 +0200)
commita37ec3f5f3edefc6976d48da4017602821a3fbad
tree96c8cfab09502f363d12d9571b148670b1745163
parenta8e38ccb4da8e6394afad53f752958a5314d6cdc
parentda1736c7d3b2f1566c6969cca537651444e9dbc2
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone

Conflicts:
coreapi/linphonecore.h
build/android/Android.mk
coreapi/linphonecore.h
coreapi/linphonecore_jni.cc
java/common/org/linphone/core/LinphoneCore.java