summaryrefslogtreecommitdiffstats
path: root/plugins/imtcp/imtcp.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-09-13 12:09:54 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-09-13 12:09:54 +0200
commitc8ba2749b60eb020fb944bb338d4d2e35f71e351 (patch)
treef6d55864de4c1a0c974240c9565c1d1cd3f23b35 /plugins/imtcp/imtcp.c
parente0897fbe64bac6b6d2a2573942ea3373bba31414 (diff)
parent5a09d0915baf292a1bfc3011668759534264a29a (diff)
downloadrsyslog-c8ba2749b60eb020fb944bb338d4d2e35f71e351.tar.gz
rsyslog-c8ba2749b60eb020fb944bb338d4d2e35f71e351.tar.bz2
rsyslog-c8ba2749b60eb020fb944bb338d4d2e35f71e351.zip
Merge branch 'v7-stable'
Conflicts: runtime/rsyslog.h
Diffstat (limited to 'plugins/imtcp/imtcp.c')
0 files changed, 0 insertions, 0 deletions