diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-18 10:51:14 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-18 10:51:14 +0100 |
| commit | 9568e7dbbb50ceb7464b659283e97a63ba3b1bd6 (patch) | |
| tree | c5f10c015dae3fcfcf52e2bc5985d40cb70fa119 /doc/manual.html | |
| parent | b941f68aaeec4bd458328e09121b623ac63f6dd6 (diff) | |
| parent | 9f1e195f3d642de85a92199ef9882b820d3fec21 (diff) | |
| download | rsyslog-9568e7dbbb50ceb7464b659283e97a63ba3b1bd6.tar.gz rsyslog-9568e7dbbb50ceb7464b659283e97a63ba3b1bd6.tar.xz rsyslog-9568e7dbbb50ceb7464b659283e97a63ba3b1bd6.zip | |
Merge branch 'v5-beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/glbl.c
tools/omdiscard.c
Diffstat (limited to 'doc/manual.html')
0 files changed, 0 insertions, 0 deletions