diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-01-26 11:33:32 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-01-26 11:33:32 +0100 |
| commit | 2c8654806373b289089b319f25146af2bb546118 (patch) | |
| tree | fbbe4ab1cd3f79c6090708820698ab6ab8a16acf /tools/zpipe.c | |
| parent | bd03b86c6322c82fc9f667122f4365e339f28ccc (diff) | |
| parent | ca8884d85d4ca35ebc8f410f78716ddb46ad86bb (diff) | |
| download | rsyslog-2c8654806373b289089b319f25146af2bb546118.tar.gz rsyslog-2c8654806373b289089b319f25146af2bb546118.tar.xz rsyslog-2c8654806373b289089b319f25146af2bb546118.zip | |
Merge branch 'queuepatch' into v4-betanew
Conflicts:
runtime/queue.c
Diffstat (limited to 'tools/zpipe.c')
0 files changed, 0 insertions, 0 deletions