summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-06-18 11:14:14 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-06-18 11:14:14 +0200
commitf529e8b2c3bb2c087bfba3fc5610a66fdbe1a8ae (patch)
tree01d936d7497a0c8ab4ba8e73b521042e2bee510f /plugins
parentd2d54013aebb756169182ed8716b142d27134a70 (diff)
parenta6ed4b59cc39fe802d06f113f238f1ffe90b7cf6 (diff)
downloadrsyslog-f529e8b2c3bb2c087bfba3fc5610a66fdbe1a8ae.tar.gz
rsyslog-f529e8b2c3bb2c087bfba3fc5610a66fdbe1a8ae.tar.xz
rsyslog-f529e8b2c3bb2c087bfba3fc5610a66fdbe1a8ae.zip
Merge branch 'master' into newmsg
Conflicts: tools/omfile.c
Diffstat (limited to 'plugins')
0 files changed, 0 insertions, 0 deletions