summaryrefslogtreecommitdiffstats
path: root/tools/pmrfc3164.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-02-24 11:04:46 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-02-24 11:04:46 +0100
commitff0f04561286ba3635f128083b46501831368701 (patch)
tree70f79d74141338cf828af122827f9367cdbb6d44 /tools/pmrfc3164.c
parentacebcd793e4898b524a9ea13b96c491aee4d67e2 (diff)
parent605701700a8914ebaff283193756a6e57d7d575b (diff)
downloadrsyslog-ff0f04561286ba3635f128083b46501831368701.zip
rsyslog-ff0f04561286ba3635f128083b46501831368701.tar.gz
rsyslog-ff0f04561286ba3635f128083b46501831368701.tar.xz
Merge branch 'v4-beta' into master
Conflicts: doc/manual.html tools/syslogd.c
Diffstat (limited to 'tools/pmrfc3164.c')
0 files changed, 0 insertions, 0 deletions