]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
authorJehan Monnier <jehan.monnier@linphone.org>
Wed, 9 Feb 2011 07:10:58 +0000 (08:10 +0100)
committerJehan Monnier <jehan.monnier@linphone.org>
Wed, 9 Feb 2011 07:10:58 +0000 (08:10 +0100)
1  2 
coreapi/sal.h

diff --cc coreapi/sal.h
Simple merge