summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-10-02 10:55:31 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-10-02 10:55:31 +0200
commit9812a2af8c308c1b29bc0b5604593595a66dd25d (patch)
tree2b556403f1a495f695fa125d34c2c5819e13f2b6 /plugins
parent75d8becf10cf83c984590ce9ba666d86b382e7e6 (diff)
parent223c1e48610c27270fdb8532f5e4a920eb9874f3 (diff)
downloadrsyslog-9812a2af8c308c1b29bc0b5604593595a66dd25d.tar.gz
rsyslog-9812a2af8c308c1b29bc0b5604593595a66dd25d.tar.xz
rsyslog-9812a2af8c308c1b29bc0b5604593595a66dd25d.zip
Merge branch 'v3-stable' into beta
Conflicts: runtime/net.c
Diffstat (limited to 'plugins')
0 files changed, 0 insertions, 0 deletions