diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-22 12:00:25 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-22 12:00:25 +0100 |
| commit | bb33c256e2d56be76f2f5d4336f08e8d5ec274c9 (patch) | |
| tree | 0549182e99f38870664a70db91d4a52e2d49f9a0 /plugins/imtcp/imtcp.c | |
| parent | ae7b78cdb27d0477c59252808d535f0beb4c541c (diff) | |
| parent | 423abcbbc0c44c612526e96bd95744a685315dd7 (diff) | |
| download | rsyslog-bb33c256e2d56be76f2f5d4336f08e8d5ec274c9.tar.gz rsyslog-bb33c256e2d56be76f2f5d4336f08e8d5ec274c9.tar.bz2 rsyslog-bb33c256e2d56be76f2f5d4336f08e8d5ec274c9.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
ChangeLog
Diffstat (limited to 'plugins/imtcp/imtcp.c')
0 files changed, 0 insertions, 0 deletions