diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-11 10:49:02 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-11 10:49:02 +0200 |
| commit | 8fae8b6d86728e4786d1fde82006ac64aee0da63 (patch) | |
| tree | 34857b3e62b5a2847456872694a1c329862ed516 | |
| parent | 3a0060c6eb7ae71221a6d08248af2fb356202583 (diff) | |
| parent | 4339d44b29aea69634abece7026ecf0154cb03c7 (diff) | |
| download | rsyslog-8fae8b6d86728e4786d1fde82006ac64aee0da63.tar.gz rsyslog-8fae8b6d86728e4786d1fde82006ac64aee0da63.tar.xz rsyslog-8fae8b6d86728e4786d1fde82006ac64aee0da63.zip | |
Merge branch 'v2-stable' into v3-stable
Conflicts:
doc/Makefile.am
doc/manual.html
| -rw-r--r-- | doc/Makefile.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index aa4e8a7d..c1d41cf8 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -22,7 +22,6 @@ html_files = \ rsyslog_php_syslog_ng.html \ rsyslog_recording_pri.html \ rsyslog_stunnel.html \ - status.html \ syslog-protocol.html \ version_naming.html \ contributors.html \ |