summaryrefslogtreecommitdiffstats
path: root/action.h
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-10-22 11:07:21 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-10-22 11:07:21 +0200
commitb6f496f8619b02c50d3f5ced34eff279244b6e9b (patch)
treed534a1941848a4f9577076cd11330f3ee014033c /action.h
parenta27e249e445deecb1d9ef57fbbb203d71bf061dd (diff)
parent162c9e91e970cc9475bc86ffd00fd1d939e1e487 (diff)
downloadrsyslog-b6f496f8619b02c50d3f5ced34eff279244b6e9b.tar.gz
rsyslog-b6f496f8619b02c50d3f5ced34eff279244b6e9b.tar.xz
rsyslog-b6f496f8619b02c50d3f5ced34eff279244b6e9b.zip
Merge branch 'master' into nextmaster
Conflicts: ChangeLog configure.ac
Diffstat (limited to 'action.h')
0 files changed, 0 insertions, 0 deletions