summaryrefslogtreecommitdiffstats
path: root/doc/netstream.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-09-12 15:17:47 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-09-12 15:17:47 +0200
commit1e819a8afe9494cc760196ac91f3b617bc073de9 (patch)
treec0701f10aecefb3a60af67c310b33b3d2bedeb0a /doc/netstream.html
parent262f61d869b95f63b393ae48d683b13e70322478 (diff)
parent4e86efaf0e20626d8f740fcff131bfd38453de4d (diff)
downloadrsyslog-1e819a8afe9494cc760196ac91f3b617bc073de9.tar.gz
rsyslog-1e819a8afe9494cc760196ac91f3b617bc073de9.tar.xz
rsyslog-1e819a8afe9494cc760196ac91f3b617bc073de9.zip
Merge branch 'beta'
Conflicts: runtime/rsyslog.h tools/syslogd.c
Diffstat (limited to 'doc/netstream.html')
0 files changed, 0 insertions, 0 deletions