]> sjero.net Git - linphone/commitdiff
Merge branch 'master' into dev_multicall
authorSimon Morlat <simon.morlat@linphone.org>
Mon, 3 May 2010 12:54:53 +0000 (14:54 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Mon, 3 May 2010 12:54:53 +0000 (14:54 +0200)
1  2 
coreapi/callbacks.c
coreapi/linphonecore.c

Simple merge
Simple merge