]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
authorSimon Morlat <simon.morlat@linphone.org>
Wed, 23 Mar 2011 16:57:51 +0000 (17:57 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Wed, 23 Mar 2011 16:57:51 +0000 (17:57 +0100)
1  2 
coreapi/linphonecore.c

Simple merge