diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-08-30 15:35:02 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-08-30 15:35:02 +0200 |
| commit | 645a8541d5bbd7cfc0dd9e9f434cce280acf7af8 (patch) | |
| tree | b388099c17ffba05be37e8cc679aec315fc64cbb /action.c | |
| parent | 154747929f87010b444af2d552f980daafe451e6 (diff) | |
| parent | d654e51e2c54e6042a73ee6c95062c916161cdbe (diff) | |
| download | rsyslog-645a8541d5bbd7cfc0dd9e9f434cce280acf7af8.tar.gz rsyslog-645a8541d5bbd7cfc0dd9e9f434cce280acf7af8.tar.xz rsyslog-645a8541d5bbd7cfc0dd9e9f434cce280acf7af8.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
ChangeLog
tools/syslogd.c
Diffstat (limited to 'action.c')
0 files changed, 0 insertions, 0 deletions