diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-04 10:40:24 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-04 10:40:24 +0100 |
| commit | f558b07493cc756dedd3c84753965697d893467a (patch) | |
| tree | e72830546580161f7a21c756771cb18a5d25e8dd /tools/syslogd.c | |
| parent | b278457d495379dd0eca1d9da8b51fcf7fad4559 (diff) | |
| parent | 38ce3ef3a5866dfc28e3b1d8c694d52b17baf236 (diff) | |
| download | rsyslog-f558b07493cc756dedd3c84753965697d893467a.tar.gz rsyslog-f558b07493cc756dedd3c84753965697d893467a.tar.bz2 rsyslog-f558b07493cc756dedd3c84753965697d893467a.zip | |
Merge branch 'master-ruleeng' into master-ruleeng-simd
Conflicts:
action.c
Diffstat (limited to 'tools/syslogd.c')
0 files changed, 0 insertions, 0 deletions