]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone
authorJehan Monnier <jehan.monnier@linphone.org>
Fri, 8 Oct 2010 16:03:26 +0000 (18:03 +0200)
committerJehan Monnier <jehan.monnier@linphone.org>
Fri, 8 Oct 2010 16:03:26 +0000 (18:03 +0200)
1  2 
coreapi/linphonecore.c

Simple merge