]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
authorSimon Morlat <simon.morlat@linphone.org>
Thu, 16 Jun 2011 12:55:07 +0000 (14:55 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Thu, 16 Jun 2011 12:55:07 +0000 (14:55 +0200)
1  2 
coreapi/linphonecore.c

Simple merge