Module: sip-router Branch: sr_3.0 Commit: 4ab86a6203dbc354e35673442a98f95fba7eb707 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4ab86a62...
Author: Juha Heinanen jh@tutpro.com Committer: Juha Heinanen jh@tutpro.com Date: Sat Oct 10 14:50:23 2009 +0300
utils/sercmd: Fixed include paths also in sr_3.0 branch.
---
utils/sercmd/sercmd.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/utils/sercmd/sercmd.c b/utils/sercmd/sercmd.c index 9c9edf0..ada5ff6 100644 --- a/utils/sercmd/sercmd.c +++ b/utils/sercmd/sercmd.c @@ -59,9 +59,9 @@ #include "parse_listen_id.h" #include "license.h"
-#include "../../modules_s/ctl/ctl_defaults.h" /* default socket & port */ -#include "../../modules_s/ctl/binrpc.h" -#include "../../modules_s/ctl/binrpc.c" /* ugly hack */ +#include "../../modules/ctl/ctl_defaults.h" /* default socket & port */ +#include "../../modules/ctl/binrpc.h" +#include "../../modules/ctl/binrpc.c" /* ugly hack */
#ifndef NAME
On Oct 10, 2009 at 13:51, Juha Heinanen jh@tutpro.com wrote:
Module: sip-router Branch: sr_3.0 Commit: 4ab86a6203dbc354e35673442a98f95fba7eb707 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4ab86a62...
Author: Juha Heinanen jh@tutpro.com Committer: Juha Heinanen jh@tutpro.com Date: Sat Oct 10 14:50:23 2009 +0300
utils/sercmd: Fixed include paths also in sr_3.0 branch.
FYI: you could have used git cherry-pick -x 17f3b62d (which is the commit you made on master): It's easier (less work).
Anyway once things stabilize a little on master (all the doc changes), I'll re-merge it into sr_3.0 (to avoid lots of cherry-picks / manual ports).
Andrei