diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-20 16:19:18 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-20 16:19:18 +0200 |
| commit | 950fe206f84322bdff755988403a9d4017ec26f4 (patch) | |
| tree | abd33a27f155d0e9090d5f7c6e52a199045d9249 /action.c | |
| parent | b8ffbecb7825f36528487d1e5fd67dd28ba6ce1d (diff) | |
| parent | bd157a7d698f420ea3a9459fc90dd930c54a5e54 (diff) | |
| download | rsyslog-950fe206f84322bdff755988403a9d4017ec26f4.tar.gz rsyslog-950fe206f84322bdff755988403a9d4017ec26f4.tar.xz rsyslog-950fe206f84322bdff755988403a9d4017ec26f4.zip | |
Merge branch 'v5-devel'
Conflicts:
plugins/imfile/imfile.c
Diffstat (limited to 'action.c')
0 files changed, 0 insertions, 0 deletions