]> sjero.net Git - linphone/commit
fix bad merge
authorSimon Morlat <simon.morlat@linphone.org>
Tue, 18 Jan 2011 15:43:14 +0000 (16:43 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Tue, 18 Jan 2011 15:43:14 +0000 (16:43 +0100)
commitb8221a048d201625cd0480402e261844790066be
tree0e1a6cb353bdb27f90bcd0c414c308fb0b2e33d7
parent68f44409c94af3ea7eeea00ab109b47d2735b99e
fix bad merge
coreapi/linphonecore.c