summaryrefslogtreecommitdiffstats
path: root/tools/smfile.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-01-27 11:47:16 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2012-01-27 11:47:16 +0100
commit3367446c0abfec6230c9f70277ddc7c7ecbacdf6 (patch)
treeacc296899eb8da0f5671e04d0234bc10971ac0a4 /tools/smfile.c
parentb826c0d3c53bc9da7014d8e75f6e3db8853b7c19 (diff)
parent2227515764469d475d42d05ca7384cb227a8dce5 (diff)
downloadrsyslog-3367446c0abfec6230c9f70277ddc7c7ecbacdf6.tar.gz
rsyslog-3367446c0abfec6230c9f70277ddc7c7ecbacdf6.tar.xz
rsyslog-3367446c0abfec6230c9f70277ddc7c7ecbacdf6.zip
Merge branch 'v5-devel'
Conflicts: ChangeLog configure.ac
Diffstat (limited to 'tools/smfile.c')
0 files changed, 0 insertions, 0 deletions