summaryrefslogtreecommitdiffstats
path: root/plugins/mmnormalize
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-01-19 14:16:57 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2012-01-19 14:16:57 +0100
commitad0fa5175901ba101a1e06f4a39ae56b75f84dca (patch)
treeb25b46993ddc5339f5ff39da7a219f664f05deac /plugins/mmnormalize
parent6624ad434b5e346a84f600845c09739208382f43 (diff)
parent1049537cd853c9714c4bdc3fe4296dda8507900d (diff)
downloadrsyslog-ad0fa5175901ba101a1e06f4a39ae56b75f84dca.tar.gz
rsyslog-ad0fa5175901ba101a1e06f4a39ae56b75f84dca.tar.xz
rsyslog-ad0fa5175901ba101a1e06f4a39ae56b75f84dca.zip
Merge branch 'v6-stable'
Conflicts: runtime/conf.c runtime/modules.c runtime/modules.h
Diffstat (limited to 'plugins/mmnormalize')
0 files changed, 0 insertions, 0 deletions