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

Simple merge