]> sjero.net Git - linphone/commitdiff
Merge remote-tracking branch 'origin/dev_opus'
authorJehan Monnier <jehan.monnier@linphone.org>
Fri, 24 May 2013 08:17:29 +0000 (10:17 +0200)
committerJehan Monnier <jehan.monnier@linphone.org>
Fri, 24 May 2013 08:17:29 +0000 (10:17 +0200)
1  2 
coreapi/linphonecore.c

Simple merge