diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-04 14:58:51 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-04 14:58:51 +0100 |
| commit | 062c1ffbdce422c0df3b5314d25d935f1bd2a9e1 (patch) | |
| tree | 4aacc6da01a86dbea578e9e54bea8db76e3bd6a4 /runtime/netstrms.c | |
| parent | 75a585a7e26d4d6cf59157cf62584c139af1527c (diff) | |
| parent | 9be853a2c8d0fd7fdc415200af57493ad5a00feb (diff) | |
| download | rsyslog-062c1ffbdce422c0df3b5314d25d935f1bd2a9e1.tar.gz rsyslog-062c1ffbdce422c0df3b5314d25d935f1bd2a9e1.tar.xz rsyslog-062c1ffbdce422c0df3b5314d25d935f1bd2a9e1.zip | |
Merge branch 'master-tcpsrv-mt'v6.1.5
Conflicts:
ChangeLog
Diffstat (limited to 'runtime/netstrms.c')
| -rw-r--r-- | runtime/netstrms.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/runtime/netstrms.c b/runtime/netstrms.c index e9ff2568..56e492fe 100644 --- a/runtime/netstrms.c +++ b/runtime/netstrms.c @@ -32,7 +32,6 @@ #include "rsyslog.h" #include "module-template.h" #include "obj.h" -//#include "errmsg.h" #include "nsd.h" #include "netstrm.h" #include "nssel.h" |