diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-13 11:32:32 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-13 11:32:32 +0200 |
| commit | 66d0561736e927e275d646bfc484cf91a247cfda (patch) | |
| tree | c31f2452bff51e7c25448ebd2dd53840d92fa118 /plugins/imtcp/imtcp.c | |
| parent | 10bef02e8f8f6bec4f1c18d9c634aa6927f4611a (diff) | |
| parent | 398975cebe7d48b3a9542acab4904a0368f3e552 (diff) | |
| download | rsyslog-66d0561736e927e275d646bfc484cf91a247cfda.tar.gz rsyslog-66d0561736e927e275d646bfc484cf91a247cfda.tar.bz2 rsyslog-66d0561736e927e275d646bfc484cf91a247cfda.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
runtime/rule.c
Diffstat (limited to 'plugins/imtcp/imtcp.c')
0 files changed, 0 insertions, 0 deletions