diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-14 08:59:19 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-14 08:59:19 +0200 |
| commit | 32269e3727df81896a1d349842f651ed887121f1 (patch) | |
| tree | 56073f61c33417216f4bad18c1afff77360589db /plugins/imtcp/imtcp.c | |
| parent | 36b9e37896b2ce89494cc354b3d10cb689ec1ee5 (diff) | |
| parent | 7ebec498f175cd6233a7161c43f1e6acd3a7cf57 (diff) | |
| download | rsyslog-32269e3727df81896a1d349842f651ed887121f1.tar.gz rsyslog-32269e3727df81896a1d349842f651ed887121f1.tar.bz2 rsyslog-32269e3727df81896a1d349842f651ed887121f1.zip | |
Merge branch 'v6-stable' into v6-devel
Conflicts:
runtime/rule.c
Diffstat (limited to 'plugins/imtcp/imtcp.c')
0 files changed, 0 insertions, 0 deletions