diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-28 17:48:45 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-28 17:48:45 +0200 |
| commit | cdbeb9d75a9a79c1f5941f748af540ab13425cf1 (patch) | |
| tree | 66c3e07e4c62e0ffc8fba8402e196823e92467d1 /plugins/imtcp/imtcp.c | |
| parent | e3a611ac6204e785d8f85ff54156dac5a722968f (diff) | |
| parent | cdd6328d1f2265f552e02502d75b6ed29846dd7b (diff) | |
| download | rsyslog-cdbeb9d75a9a79c1f5941f748af540ab13425cf1.tar.gz rsyslog-cdbeb9d75a9a79c1f5941f748af540ab13425cf1.tar.bz2 rsyslog-cdbeb9d75a9a79c1f5941f748af540ab13425cf1.zip | |
Merge branch 'master' into master-newruleset
Conflicts:
ChangeLog
Diffstat (limited to 'plugins/imtcp/imtcp.c')
0 files changed, 0 insertions, 0 deletions