]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone
authorGuillaume Beraudo <guillaume.beraudo@linphone.org>
Thu, 25 Nov 2010 10:49:19 +0000 (11:49 +0100)
committerGuillaume Beraudo <guillaume.beraudo@linphone.org>
Thu, 25 Nov 2010 10:49:19 +0000 (11:49 +0100)
1  2 
coreapi/linphonecore.h

Simple merge