diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-16 13:59:16 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-16 13:59:16 +0100 |
| commit | 189a26c0444178612bf6e4618ccd9c722b83c261 (patch) | |
| tree | 243d27b68a14ebcd2c7263a3492ace23542c5f13 /action.c | |
| parent | c5611012f9d82155d6017435b5cf52c0b4e31149 (diff) | |
| parent | 371a8eec29fa25bbf58f4b1f0d7e3bf4c3ad6329 (diff) | |
| download | rsyslog-189a26c0444178612bf6e4618ccd9c722b83c261.tar.gz rsyslog-189a26c0444178612bf6e4618ccd9c722b83c261.tar.xz rsyslog-189a26c0444178612bf6e4618ccd9c722b83c261.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
ChangeLog
runtime/parser.c
runtime/queue.c
runtime/wtp.c
template.c
threads.c
tools/syslogd.c
Diffstat (limited to 'action.c')
0 files changed, 0 insertions, 0 deletions