diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-10 12:53:04 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-10 12:53:04 +0100 |
commit | 384de6a4429436c981ad2dc87f4341dae767a89c (patch) | |
tree | a2a7be6836208acb3fc8fbd87b95870cdf21d549 /runtime/stream.c | |
parent | 2759e1dd846cb4e3bef78a849005afc8d0fa7438 (diff) | |
parent | 2b5e15d549940c7ace9017eaf40d523e3741c9a2 (diff) | |
download | rsyslog-384de6a4429436c981ad2dc87f4341dae767a89c.tar.gz rsyslog-384de6a4429436c981ad2dc87f4341dae767a89c.tar.xz rsyslog-384de6a4429436c981ad2dc87f4341dae767a89c.zip |
Merge branch 'v4-beta'
Conflicts:
ChangeLog
Diffstat (limited to 'runtime/stream.c')
0 files changed, 0 insertions, 0 deletions