diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-15 11:07:59 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-15 11:07:59 +0200 |
| commit | 61ba5ff5955742b68a24d7b135ad07c29b48fa2f (patch) | |
| tree | da96436375c623133fef91bb6cb9185e735bb8d4 /doc/Makefile.am | |
| parent | 63d4de81ec485425231676d53813ff465249e800 (diff) | |
| parent | b7fec51ba7b1042313b51dc27102fa0a9cebafb5 (diff) | |
| download | rsyslog-61ba5ff5955742b68a24d7b135ad07c29b48fa2f.tar.gz rsyslog-61ba5ff5955742b68a24d7b135ad07c29b48fa2f.tar.xz rsyslog-61ba5ff5955742b68a24d7b135ad07c29b48fa2f.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/ommail.html
queue.c
Diffstat (limited to 'doc/Makefile.am')
| -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 \ |