summaryrefslogtreecommitdiffstats
path: root/runtime/net.h
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-09-22 15:49:54 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-09-22 15:49:54 +0200
commit1b2270ad3a6a78b1d11a7f7639208a42aabce578 (patch)
tree21b6aace8d7c35cf2b9d90368dc58baf1c13c200 /runtime/net.h
parent4e86efaf0e20626d8f740fcff131bfd38453de4d (diff)
parent571c51fe3481192febdf40343a21a60c69498aab (diff)
downloadrsyslog-1b2270ad3a6a78b1d11a7f7639208a42aabce578.tar.gz
rsyslog-1b2270ad3a6a78b1d11a7f7639208a42aabce578.tar.xz
rsyslog-1b2270ad3a6a78b1d11a7f7639208a42aabce578.zip
Merge branch 'v3-stable' into beta
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'runtime/net.h')
0 files changed, 0 insertions, 0 deletions