]> sjero.net Git - linphone/commit
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)
commit2027bef31498249feef33795c869de40583650e1
tree88cb1746a6929987a5ed557e62b914130a5dc9b0
parent8fce88f12d51c4f8557e0ba1948f7ed705383760
parentaf3209cfd057105dbdec63a8c811aaf5c8fc101b
Merge branch 'master' into dev_multicall
coreapi/callbacks.c
coreapi/linphonecore.c