]> sjero.net Git - linphone/commitdiff
Merge branch 'dev_sal' of belledonne-communications.com:linphone-private into dev_sal
authorSimon Morlat <simon.morlat@linphone.org>
Wed, 24 Mar 2010 16:06:46 +0000 (17:06 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Wed, 24 Mar 2010 16:06:46 +0000 (17:06 +0100)
1  2 
coreapi/sal_eXosip2.c

Simple merge