]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
authorSimon Morlat <simon.morlat@linphone.org>
Fri, 24 Jun 2011 12:12:31 +0000 (14:12 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Fri, 24 Jun 2011 12:12:31 +0000 (14:12 +0200)
1  2 
coreapi/sal.h
coreapi/sal_eXosip2.c

diff --cc coreapi/sal.h
Simple merge
Simple merge