]> sjero.net Git - linphone/commit
Merge branch 'master' into dev_multicall
authorSimon Morlat <simon.morlat@linphone.org>
Wed, 2 Jun 2010 15:58:46 +0000 (17:58 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Wed, 2 Jun 2010 15:58:46 +0000 (17:58 +0200)
commita3a4fe17d890d12997a0ae5041c096d99cfe49e7
tree49a7b935f169abf51ae9ac217a027ecdc6fb9c80
parentd37e618afa2b3b5364c1e537149f5c6404afc6c1
parente7eb4edfbdb113ddae8cb06295ea8491222fbe56
Merge branch 'master' into dev_multicall

Conflicts:
mediastreamer2
coreapi/linphonecore.c