summaryrefslogtreecommitdiffstats
path: root/runtime/stream.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-03-09 14:28:30 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-03-09 14:28:30 +0100
commitc802afb7e0fc5e2c87af24e12bf63e4a0ba7688c (patch)
tree107991afae384af32c95be306c86f387ea67083b /runtime/stream.c
parent81c9cf86267fb0ec1156e578439d09499c97e80f (diff)
parentde7726cbf0957384cc9261ac47d6bf65906739b5 (diff)
downloadrsyslog-c802afb7e0fc5e2c87af24e12bf63e4a0ba7688c.tar.gz
rsyslog-c802afb7e0fc5e2c87af24e12bf63e4a0ba7688c.tar.xz
rsyslog-c802afb7e0fc5e2c87af24e12bf63e4a0ba7688c.zip
Merge branch 'v5-stable'
Conflicts: ChangeLog configure.ac doc/manual.html doc/property_replacer.html runtime/datetime.h
Diffstat (limited to 'runtime/stream.c')
0 files changed, 0 insertions, 0 deletions