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

Simple merge
Simple merge