diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-10-02 10:55:31 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-10-02 10:55:31 +0200 |
| commit | 9812a2af8c308c1b29bc0b5604593595a66dd25d (patch) | |
| tree | 2b556403f1a495f695fa125d34c2c5819e13f2b6 /doc/Makefile.am | |
| parent | 75d8becf10cf83c984590ce9ba666d86b382e7e6 (diff) | |
| parent | 223c1e48610c27270fdb8532f5e4a920eb9874f3 (diff) | |
| download | rsyslog-9812a2af8c308c1b29bc0b5604593595a66dd25d.tar.gz rsyslog-9812a2af8c308c1b29bc0b5604593595a66dd25d.tar.xz rsyslog-9812a2af8c308c1b29bc0b5604593595a66dd25d.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
runtime/net.c
Diffstat (limited to 'doc/Makefile.am')
| -rw-r--r-- | doc/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index de3675de..4f4aae19 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,5 @@ html_files = \ + index.html \ bugs.html \ debug.html \ features.html \ @@ -7,6 +8,7 @@ html_files = \ history.html \ how2help.html \ install.html \ + build_from_repo.html \ ipv6.html \ log_rotation_fix_size.html \ manual.html \ |