diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-06 15:12:51 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-06 15:12:51 +0200 |
| commit | 29cd813960ed8e4f800cb9210d30888368587f1c (patch) | |
| tree | 7fd216d79c33106fb12bf744f995480f8665f357 /action.c | |
| parent | d6602c1a6cfd48ff1f5b7656eb429d60ce927ebc (diff) | |
| parent | 7f109cca88816752a9c9cbe255df9e3a5b5a8b5a (diff) | |
| download | rsyslog-29cd813960ed8e4f800cb9210d30888368587f1c.tar.gz rsyslog-29cd813960ed8e4f800cb9210d30888368587f1c.tar.xz rsyslog-29cd813960ed8e4f800cb9210d30888368587f1c.zip | |
Merge branch 'v5-stable' into v5-beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/modules.c
Diffstat (limited to 'action.c')
0 files changed, 0 insertions, 0 deletions