diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-16 16:57:46 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-16 16:57:46 +0100 |
| commit | 2f2169c5c29d9f655a334c2da10d2582c5ffc82b (patch) | |
| tree | c693b28a6ea5548af0a25676992af8f519036ff9 /plugins/imptcp | |
| parent | 18e60f46a1bbdbcb446369a0f03dbb04f29fb71e (diff) | |
| parent | 209a6d8e15afb83c0bf146dd95fc203bb9983242 (diff) | |
| download | rsyslog-2f2169c5c29d9f655a334c2da10d2582c5ffc82b.tar.gz rsyslog-2f2169c5c29d9f655a334c2da10d2582c5ffc82b.tar.xz rsyslog-2f2169c5c29d9f655a334c2da10d2582c5ffc82b.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
tools/syslogd.c
Diffstat (limited to 'plugins/imptcp')
0 files changed, 0 insertions, 0 deletions