diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-16 16:14:30 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-16 16:14:30 +0100 |
| commit | 18e60f46a1bbdbcb446369a0f03dbb04f29fb71e (patch) | |
| tree | ed65387ee8dde4afad5d1d10eae5c8d2de9ccd23 /dirty.h | |
| parent | 095021e866188d2db9eb267304a6bb73c19545e0 (diff) | |
| parent | bd22bf8cb414f12c7b307bef463fbda5d51bee22 (diff) | |
| download | rsyslog-18e60f46a1bbdbcb446369a0f03dbb04f29fb71e.tar.gz rsyslog-18e60f46a1bbdbcb446369a0f03dbb04f29fb71e.tar.xz rsyslog-18e60f46a1bbdbcb446369a0f03dbb04f29fb71e.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
runtime/debug.h
runtime/obj.c
runtime/parser.h
runtime/wti.h
Diffstat (limited to 'dirty.h')
0 files changed, 0 insertions, 0 deletions