summaryrefslogtreecommitdiffstats
path: root/plugins/mmnormalize/mmnormalize.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-03-18 12:31:20 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2013-03-18 12:31:20 +0100
commitdac7e3d39b7d2dfe5c3fddf38275b2ca49d5396e (patch)
treecb10a26f7025e989cd3a01bb9df829763d5c6c4d /plugins/mmnormalize/mmnormalize.c
parent4dce63486fbb197522e11c5644cdf7aef5d7bbbc (diff)
parentff261830c65f7d094584dba1f9bce669bd6748d4 (diff)
downloadrsyslog-dac7e3d39b7d2dfe5c3fddf38275b2ca49d5396e.tar.gz
rsyslog-dac7e3d39b7d2dfe5c3fddf38275b2ca49d5396e.tar.bz2
rsyslog-dac7e3d39b7d2dfe5c3fddf38275b2ca49d5396e.zip
Merge branch 'v7-stable'
Conflicts: runtime/debug.h tools/syslogd.c
Diffstat (limited to 'plugins/mmnormalize/mmnormalize.c')
0 files changed, 0 insertions, 0 deletions