summaryrefslogtreecommitdiffstats
path: root/plugins/mmnormalize/mmnormalize.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-09-06 12:04:36 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-09-06 12:04:36 +0200
commit3ab1e5b943d297ed0b23a8988f354fed3fec9fdf (patch)
tree4e4e29a0911eebb7e2842e3ec5a6d9a5686720ae /plugins/mmnormalize/mmnormalize.c
parent200e08ac4252a0a0eca31a441e63688179baebb1 (diff)
parentbb6f5dc40f39220a2cdb05e94d70aac42d971ac4 (diff)
downloadrsyslog-3ab1e5b943d297ed0b23a8988f354fed3fec9fdf.tar.gz
rsyslog-3ab1e5b943d297ed0b23a8988f354fed3fec9fdf.tar.bz2
rsyslog-3ab1e5b943d297ed0b23a8988f354fed3fec9fdf.zip
Merge branch 'master' into master-newruleset
Conflicts: runtime/rsconf.c
Diffstat (limited to 'plugins/mmnormalize/mmnormalize.c')
0 files changed, 0 insertions, 0 deletions