summaryrefslogtreecommitdiffstats
path: root/action.h
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-04-26 14:14:59 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-04-26 14:14:59 +0200
commit59497bd057f6ee1bcb626d2ce30bf3eb8ef6ebd0 (patch)
treedfa46b9835e484de9462e2721a462df51f2e521f /action.h
parent0944d4b5422b232daadfe4acc6a73c5e2e83c77b (diff)
parent270e455d6d9c6e7e580d6784435bf57ddc71bd85 (diff)
downloadrsyslog-59497bd057f6ee1bcb626d2ce30bf3eb8ef6ebd0.tar.gz
rsyslog-59497bd057f6ee1bcb626d2ce30bf3eb8ef6ebd0.tar.xz
rsyslog-59497bd057f6ee1bcb626d2ce30bf3eb8ef6ebd0.zip
Merge branch 'v5-stable'
Conflicts: tests/diag.sh
Diffstat (limited to 'action.h')
0 files changed, 0 insertions, 0 deletions