diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-25 08:26:18 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-25 08:26:18 +0100 |
commit | 648e84cad86a94d2f21ceed37e020fbed6a27b9d (patch) | |
tree | 93f9dcff68b5aadd41f9b4ff8e919a0faa37979e /tools/ompipe.h | |
parent | 2f8b5cafd0dcc5f09b7b64f5015a2aebd1c7b31c (diff) | |
parent | 841f841ce12e49659966db006f3f244e1f23b70e (diff) | |
download | rsyslog-648e84cad86a94d2f21ceed37e020fbed6a27b9d.tar.gz rsyslog-648e84cad86a94d2f21ceed37e020fbed6a27b9d.tar.xz rsyslog-648e84cad86a94d2f21ceed37e020fbed6a27b9d.zip |
Merge branch 'v4-stable' into v4-stable-solaris
Conflicts:
ChangeLog
Diffstat (limited to 'tools/ompipe.h')
0 files changed, 0 insertions, 0 deletions