diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-11-25 12:52:24 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-11-25 12:52:24 +0100 |
| commit | ed2a2fd829d36e87086be666b319ac4b17ded8c2 (patch) | |
| tree | ea1a2514818499c73f8dd6f8f562593d5e645ccb /tools | |
| parent | da8670d37a49ebda19dea708f716ad66a75f94e4 (diff) | |
| parent | d1846d8561fe5ecce13248b7b34333362d050c01 (diff) | |
| download | rsyslog-ed2a2fd829d36e87086be666b319ac4b17ded8c2.tar.gz rsyslog-ed2a2fd829d36e87086be666b319ac4b17ded8c2.tar.xz rsyslog-ed2a2fd829d36e87086be666b319ac4b17ded8c2.zip | |
Merge branch 'v4.4.2a' into v4-stable
Conflicts:
ChangeLog
configure.ac
plugins/imfile/imfile.c
runtime/stream.c
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions