]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
authorJehan Monnier <jehan.monnier@linphone.org>
Thu, 3 Feb 2011 15:06:50 +0000 (16:06 +0100)
committerJehan Monnier <jehan.monnier@linphone.org>
Thu, 3 Feb 2011 15:06:50 +0000 (16:06 +0100)
1  2 
coreapi/sal_eXosip2.c

Simple merge