]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone
authorYann Diorcet <yann.diorcet@belledonne-communications.com>
Wed, 31 Oct 2012 09:52:56 +0000 (10:52 +0100)
committerYann Diorcet <yann.diorcet@belledonne-communications.com>
Wed, 31 Oct 2012 09:52:56 +0000 (10:52 +0100)
1  2 
coreapi/linphonecore.c

Simple merge