]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone-private
authorJehan Monnier <jehan.monnier@linphone.org>
Tue, 15 Jun 2010 12:00:26 +0000 (14:00 +0200)
committerJehan Monnier <jehan.monnier@linphone.org>
Tue, 15 Jun 2010 12:00:26 +0000 (14:00 +0200)
1  2 
coreapi/sal.h
coreapi/sal_eXosip2.c

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