diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-24 11:04:46 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-24 11:04:46 +0100 |
| commit | ff0f04561286ba3635f128083b46501831368701 (patch) | |
| tree | 70f79d74141338cf828af122827f9367cdbb6d44 /tools | |
| parent | acebcd793e4898b524a9ea13b96c491aee4d67e2 (diff) | |
| parent | 605701700a8914ebaff283193756a6e57d7d575b (diff) | |
| download | rsyslog-ff0f04561286ba3635f128083b46501831368701.tar.gz rsyslog-ff0f04561286ba3635f128083b46501831368701.tar.xz rsyslog-ff0f04561286ba3635f128083b46501831368701.zip | |
Merge branch 'v4-beta' into master
Conflicts:
doc/manual.html
tools/syslogd.c
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions