diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-26 17:00:12 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-26 17:00:12 +0100 |
commit | 46ac70bb3073295f70bdddc8359d056bc0651909 (patch) | |
tree | 98b42b96616bc087980b0ddff9609f9174599d9e /tools/ompipe.c | |
parent | 3ab759c40d34f518744efa9b266640784fc3655f (diff) | |
parent | b6ce75cb6ce65a468f9551d98a641b407a4f2630 (diff) | |
download | rsyslog-46ac70bb3073295f70bdddc8359d056bc0651909.tar.gz rsyslog-46ac70bb3073295f70bdddc8359d056bc0651909.tar.xz rsyslog-46ac70bb3073295f70bdddc8359d056bc0651909.zip |
Merge branch 'v4-stable' into v4-stable-solaris
Conflicts:
ChangeLog
Diffstat (limited to 'tools/ompipe.c')
0 files changed, 0 insertions, 0 deletions