diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-13 16:17:50 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-13 16:17:50 +0100 |
| commit | ef9128a9f92f2a68ac0fb5db27ded192a258df13 (patch) | |
| tree | 4dd8bbd724cbe18b34f0be70e46d96b0aba59fd5 /plugins/imtcp/imtcp.c | |
| parent | dc8f9b531c6c53af7a81a5a378ba1c1514f7a47c (diff) | |
| parent | 85536bc0c9c39c21ff1b1c158667d2a5aab6b355 (diff) | |
| download | rsyslog-ef9128a9f92f2a68ac0fb5db27ded192a258df13.tar.gz rsyslog-ef9128a9f92f2a68ac0fb5db27ded192a258df13.tar.bz2 rsyslog-ef9128a9f92f2a68ac0fb5db27ded192a258df13.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
ChangeLog
Diffstat (limited to 'plugins/imtcp/imtcp.c')
0 files changed, 0 insertions, 0 deletions