]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of belledonne-communications.com:linphone-private
authorSimon Morlat <simon.morlat@linphone.org>
Thu, 17 Jun 2010 10:18:43 +0000 (12:18 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Thu, 17 Jun 2010 10:18:43 +0000 (12:18 +0200)
1  2 
coreapi/linphonecore.c

Simple merge