]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone
authorGuillaume Beraudo <guillaume.beraudo@linphone.org>
Thu, 20 Jan 2011 11:42:55 +0000 (12:42 +0100)
committerGuillaume Beraudo <guillaume.beraudo@linphone.org>
Thu, 20 Jan 2011 11:42:55 +0000 (12:42 +0100)
1  2 
coreapi/sal_eXosip2.c

Simple merge