[sr-dev] git:adubovikov/homer: modules/sipcapture, modules_k/siptrace: fix merge

Module: sip-router Branch: adubovikov/homer Commit: 95a3ea6375752cd8c741f9a59987f3e8a83a5710 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=95a3ea6… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Thu Sep 22 16:08:40 2011 +0200 modules/sipcapture, modules_k/siptrace: fix merge --- modules/sipcapture/examples/crontabtruncate.pl | 10 - modules/sipcapture/examples/kamailio.cfg | 8 - modules/sipcapture/examples/partrotate_todays.pl | 5 +- .../examples/partrotate_unixtimestamp.pl | 6 +- modules/sipcapture/sipcapture.c | 17 -- modules/sipcapture/sql/sipcapture-create.sql | 32 --- modules_k/siptrace/siptrace.c | 260 -------------------- 7 files changed, 4 insertions(+), 334 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=95a…