]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone-private
authorJehan Monnier <jehan.monnier@linphone.org>
Fri, 21 May 2010 13:58:31 +0000 (15:58 +0200)
committerJehan Monnier <jehan.monnier@linphone.org>
Fri, 21 May 2010 13:58:31 +0000 (15:58 +0200)
1  2 
coreapi/linphonecore.h
coreapi/sal_eXosip2.c

Simple merge
Simple merge