diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-01-10 12:28:16 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-01-10 12:28:16 +0100 |
| commit | 58c486b36b27d30444b621876846052e239f8c50 (patch) | |
| tree | 15911977ac02103e829fb228105786fd3940a2b3 /dirty.h | |
| parent | 68c13f3f6a691c7f854e6fa4caff43295896dbde (diff) | |
| parent | dec726ed46a75750b30117ba772fc82e8660db1d (diff) | |
| download | rsyslog-58c486b36b27d30444b621876846052e239f8c50.tar.gz rsyslog-58c486b36b27d30444b621876846052e239f8c50.tar.xz rsyslog-58c486b36b27d30444b621876846052e239f8c50.zip | |
Merge branch 'v4-devel' into v5-devel-newimudp
Conflicts:
ChangeLog
configure.ac
plugins/imudp/imudp.c
Diffstat (limited to 'dirty.h')
0 files changed, 0 insertions, 0 deletions