diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-10 17:18:11 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-10 17:18:11 +0100 |
| commit | 545a80918b9a0cc75e12de4a9c718dc875a5276a (patch) | |
| tree | 9db178a3dab87f3e65b64388513dd8f449ada90e /doc/multi_ruleset.html | |
| parent | 159abfbc37e8ae4c86e2c7422f18c7d613b33e7d (diff) | |
| parent | a2e69cffff21ad433e61b45f91a2be4d5ebc5c72 (diff) | |
| download | rsyslog-545a80918b9a0cc75e12de4a9c718dc875a5276a.tar.gz rsyslog-545a80918b9a0cc75e12de4a9c718dc875a5276a.tar.xz rsyslog-545a80918b9a0cc75e12de4a9c718dc875a5276a.zip | |
Merge branch 'tmp' into v4-stable-tmp
Conflicts:
dirty.h
doc/rsyslog_conf_global.html
tools/syslogd.c
Diffstat (limited to 'doc/multi_ruleset.html')
0 files changed, 0 insertions, 0 deletions