summaryrefslogtreecommitdiffstats
path: root/plugins/imfile/imfile.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-10-11 09:42:49 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-10-11 09:42:49 +0200
commit55f67bfc9fe14279d371fa2b899abaa8684621f3 (patch)
tree3b6246413dc1ad9b514e84be4b12cc22e7cebc53 /plugins/imfile/imfile.c
parent98a94a68b677074c2061133eb273c3f66d65a8ce (diff)
parent5114dc9fa217ac2c8a0d99e714fa42749744fa80 (diff)
downloadrsyslog-55f67bfc9fe14279d371fa2b899abaa8684621f3.tar.gz
rsyslog-55f67bfc9fe14279d371fa2b899abaa8684621f3.tar.bz2
rsyslog-55f67bfc9fe14279d371fa2b899abaa8684621f3.zip
Merge branch 'beta'
Conflicts: ChangeLog
Diffstat (limited to 'plugins/imfile/imfile.c')
0 files changed, 0 insertions, 0 deletions