]> sjero.net Git - linphone/commit
Merge branch 'master' into dev_sal
authorSimon Morlat <simon.morlat@linphone.org>
Wed, 3 Mar 2010 15:31:23 +0000 (16:31 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Wed, 3 Mar 2010 15:31:23 +0000 (16:31 +0100)
commit8d5c47d4a679771251673d74214dcece4f39decf
tree1c36bb645cea63ef0e08d4deb054dbb92ca2f870
parentec6f061ea7a0fd876a4ecf065c9d789158820d1d
parent0024812b966d1d34537926a6ae41a59c85c758f3
Merge branch 'master' into dev_sal

Conflicts:
coreapi/linphonecore.h
coreapi/linphonecore.c
coreapi/linphonecore.h
coreapi/private.h