diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-08-30 15:45:43 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-08-30 15:45:43 +0200 |
| commit | f58dd9c146d227758bcc065639c31995c6c23800 (patch) | |
| tree | b8a9f21999a35d48c71af5c9bf3843a187881597 /action.c | |
| parent | a34d37a9e32a851002c07538532789b33d91f862 (diff) | |
| parent | 581daa5418548dda4c9b5438878559a1bbd4b087 (diff) | |
| download | rsyslog-f58dd9c146d227758bcc065639c31995c6c23800.tar.gz rsyslog-f58dd9c146d227758bcc065639c31995c6c23800.tar.xz rsyslog-f58dd9c146d227758bcc065639c31995c6c23800.zip | |
Merge branch 'v4-beta' into v5-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h
Diffstat (limited to 'action.c')
0 files changed, 0 insertions, 0 deletions