]> sjero.net Git - linphone/commit
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone
authorJehan Monnier <jehan.monnier@linphone.org>
Mon, 24 Jan 2011 09:42:48 +0000 (10:42 +0100)
committerJehan Monnier <jehan.monnier@linphone.org>
Mon, 24 Jan 2011 09:42:48 +0000 (10:42 +0100)
commit744739d6f69f170f7ef19d8d589c06f1adb37eea
tree42bb50e17179e2d635f3e4ac289b8fc3cb10fb05
parente0e2e3e792712b8bf0b618e8292a7ad1db3c0b41
parentb610dfb1589fcd86a37785d7278f72a60ac405a8
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone

Conflicts:
coreapi/linphonecall.c
mediastreamer2
coreapi/linphonecall.c
coreapi/linphonecore.c