]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of belledonne-communications.com:linphone-private
authorSimon Morlat <simon.morlat@linphone.org>
Thu, 25 Mar 2010 12:55:42 +0000 (13:55 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Thu, 25 Mar 2010 12:55:42 +0000 (13:55 +0100)
1  2 
coreapi/linphonecore.c

Simple merge