summaryrefslogtreecommitdiffstats
path: root/plugins/imsolaris/imsolaris.h
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-11-29 16:59:19 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2013-11-29 16:59:19 +0100
commitc4501ebb5263b3b85bc6a854fcc3b6a35e94840a (patch)
tree8ecca199cfeba599e1465e4426b55ca9a67da3b0 /plugins/imsolaris/imsolaris.h
parent56e2157bae6e5ad9e64ef672735a6e6e45e34312 (diff)
parenta98b1822a389cd209cb7a6660060abf995fbf715 (diff)
downloadrsyslog-c4501ebb5263b3b85bc6a854fcc3b6a35e94840a.tar.gz
rsyslog-c4501ebb5263b3b85bc6a854fcc3b6a35e94840a.tar.bz2
rsyslog-c4501ebb5263b3b85bc6a854fcc3b6a35e94840a.zip
Merge branch 'v7-devel' into tmp
Conflicts: action.c
Diffstat (limited to 'plugins/imsolaris/imsolaris.h')
0 files changed, 0 insertions, 0 deletions