]> sjero.net Git - linphone/commit
Merge branch 'master' of belledonne-communications.com:linphone-private
authorJehan Monnier <jehan.monnier@linphone.org>
Thu, 11 Mar 2010 13:40:13 +0000 (14:40 +0100)
committerJehan Monnier <jehan.monnier@linphone.org>
Thu, 11 Mar 2010 13:40:13 +0000 (14:40 +0100)
commitfbac5e27be04e4b6470f4b9153258e80a55ca7a4
tree45999e41e31ecb8e3e7b9f86977145a59eece43c
parent59c9380b9186411c8882291d5a01cb91b5470f71
parent4d09f9af4e42f2777e9f451f1242d587398cdf62
Merge branch 'master' of belledonne-communications.com:linphone-private

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