diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-01-10 12:54:21 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-01-10 12:54:21 +0100 |
| commit | f7c20920046ebcb94eadadf1ebad97b634a12a2d (patch) | |
| tree | 0cf704f462fa7394842beb3a496627915d863426 /plugins/omtemplate | |
| parent | 58c486b36b27d30444b621876846052e239f8c50 (diff) | |
| parent | 7742b2182fc017ca4c9fcfe3b26f4c8d68a9bd58 (diff) | |
| download | rsyslog-f7c20920046ebcb94eadadf1ebad97b634a12a2d.tar.gz rsyslog-f7c20920046ebcb94eadadf1ebad97b634a12a2d.tar.xz rsyslog-f7c20920046ebcb94eadadf1ebad97b634a12a2d.zip | |
Merge branch 'v5.6.2-newimudp' into v5-devel-newimudp
Conflicts:
plugins/imudp/imudp.c
threads.c
Diffstat (limited to 'plugins/omtemplate')
0 files changed, 0 insertions, 0 deletions