summaryrefslogtreecommitdiffstats
path: root/plugins/imkmsg/kmsg.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-07-04 11:31:58 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-07-04 11:31:58 +0200
commit4a8a1444d26b3a9c488acaf838e34763f45cbeb9 (patch)
tree2ba5810de476a7cacb21e3697363d632122e8620 /plugins/imkmsg/kmsg.c
parentb81919fe9c2b427735339faad5a0879039041f13 (diff)
parent114e996c35e1101cba68f799595761e1f4c3d1ab (diff)
downloadrsyslog-4a8a1444d26b3a9c488acaf838e34763f45cbeb9.tar.gz
rsyslog-4a8a1444d26b3a9c488acaf838e34763f45cbeb9.tar.bz2
rsyslog-4a8a1444d26b3a9c488acaf838e34763f45cbeb9.zip
Merge branch 'v7-stable'
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'plugins/imkmsg/kmsg.c')
0 files changed, 0 insertions, 0 deletions