diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-01-26 12:09:48 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-01-26 12:09:48 +0100 |
| commit | 7f4972b9fa132c7e5c8077f58e3e2845326884af (patch) | |
| tree | 1100978c1a2c559d5431c71d6d40ea2bcb97317f /action.c | |
| parent | 452fb9282d3c53ce2a7256adfc1948b10b5b532e (diff) | |
| parent | 939852b1cdfaed376342a3a0aa4b0fb7c14f55c5 (diff) | |
| download | rsyslog-7f4972b9fa132c7e5c8077f58e3e2845326884af.tar.gz rsyslog-7f4972b9fa132c7e5c8077f58e3e2845326884af.tar.xz rsyslog-7f4972b9fa132c7e5c8077f58e3e2845326884af.zip | |
Merge branch 'v4-beta' into beta
Conflicts:
ChangeLog
runtime/queue.c
Diffstat (limited to 'action.c')
0 files changed, 0 insertions, 0 deletions