summaryrefslogtreecommitdiffstats
path: root/action.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-08-30 16:01:12 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-08-30 16:01:12 +0200
commita8b231875ba6990422f85bd60237c5a2f3c4e7d0 (patch)
tree247851ec5e4a91e02390d0fff3e2549f52759e20 /action.c
parente14d353e69a75290c3e4004df79f42a22bfe4cab (diff)
parent43dd1bc0e659f3ddce2f2c5138864d36a5647846 (diff)
downloadrsyslog-a8b231875ba6990422f85bd60237c5a2f3c4e7d0.tar.gz
rsyslog-a8b231875ba6990422f85bd60237c5a2f3c4e7d0.tar.xz
rsyslog-a8b231875ba6990422f85bd60237c5a2f3c4e7d0.zip
Merge branch 'beta'
Conflicts: ChangeLog
Diffstat (limited to 'action.c')
0 files changed, 0 insertions, 0 deletions