diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-07-14 11:19:56 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-07-14 11:19:56 +0200 |
| commit | 93fed4bd309f658a23cff3b3133ab124ee226557 (patch) | |
| tree | 14efb2f526ad7e588aad6d02ed7d73234c66ca96 /doc | |
| parent | 1790a23aea2d98dd855d55a990aae18c5eb0e8b3 (diff) | |
| parent | 816fda97750454bba0845a83d1a2b1ddcabe85e4 (diff) | |
| download | rsyslog-93fed4bd309f658a23cff3b3133ab124ee226557.tar.gz rsyslog-93fed4bd309f658a23cff3b3133ab124ee226557.tar.xz rsyslog-93fed4bd309f658a23cff3b3133ab124ee226557.zip | |
Merge branch 'beta' - important mutex bugfix
Conflicts:
ChangeLog
configure.ac
doc/Makefile.am
doc/manual.html
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile.am | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index f7c81c61..de3675de 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -90,6 +90,12 @@ html_files = \ ns_gtls.html \ ns_ptcp.html \ src/tls_cert.dia \ + gssapi.html \ + licensing.html \ + ommail.html \ + omrelp.html \ + status.html \ + troubleshoot.html \ src/classes.dia EXTRA_DIST = $(html_files) |