]> sjero.net Git - linphone/commit
fix bad merge (wasn't compiling)
authorSimon Morlat <simon.morlat@linphone.org>
Fri, 21 Oct 2011 10:05:28 +0000 (12:05 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Fri, 21 Oct 2011 10:05:28 +0000 (12:05 +0200)
commit2b16115ebf7e8016ce61ddfef9399137d8c7208f
tree9fd20f15cfd4feb716bba6dbe59d3726184f6e9e
parent7f7ee739c2ab77a16774ba8368d3da7d9bf5617d
fix bad merge (wasn't compiling)
coreapi/callbacks.c