diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-05 12:45:14 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-05 12:45:14 +0200 |
| commit | 5a596871194cb4c573bea7cbbd9c96e07dd27dd4 (patch) | |
| tree | 5b2062fcdae0a2f43724b7b659c351d069320434 /plugins/imtcp/imtcp.c | |
| parent | 805061b34a2273b487f799fc8e8554abbd70a2d7 (diff) | |
| parent | 5df935249e85c842f5fcbd636d300c17ab31f0f5 (diff) | |
| download | rsyslog-5a596871194cb4c573bea7cbbd9c96e07dd27dd4.tar.gz rsyslog-5a596871194cb4c573bea7cbbd9c96e07dd27dd4.tar.bz2 rsyslog-5a596871194cb4c573bea7cbbd9c96e07dd27dd4.zip | |
Merge branch 'c1-streamzip' into master-streamzip
Conflicts:
ChangeLog
configure.ac
doc/rsyslog_conf_global.html
runtime/stream.c
tools/omfile.c
Diffstat (limited to 'plugins/imtcp/imtcp.c')
0 files changed, 0 insertions, 0 deletions