diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-05 10:33:24 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-05 10:33:24 +0100 |
| commit | 9052857047f0cb67ef7b2fe1519120bf37ba2648 (patch) | |
| tree | e1a526571a1d54102bed75448ae0902a6e3f6aef /plugins/omprog/omprog.c | |
| parent | 38ce3ef3a5866dfc28e3b1d8c694d52b17baf236 (diff) | |
| parent | 938eff729c581657eb84c0ea0a7a6665ecd040be (diff) | |
| download | rsyslog-9052857047f0cb67ef7b2fe1519120bf37ba2648.tar.gz rsyslog-9052857047f0cb67ef7b2fe1519120bf37ba2648.tar.bz2 rsyslog-9052857047f0cb67ef7b2fe1519120bf37ba2648.zip | |
Merge branch 'master' into master-ruleeng
Conflicts:
runtime/ruleset.c
Diffstat (limited to 'plugins/omprog/omprog.c')
0 files changed, 0 insertions, 0 deletions