diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-05 16:10:27 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-05 16:10:27 +0200 |
| commit | c7e9e2123ee71fb868bbcff59225e009e21af590 (patch) | |
| tree | 12ab52bb20cb34c9fcd36816e836a1959440d5fc /doc/Makefile.am | |
| parent | 304ab88dd64b2ae46554fa5394aa8822194b1e95 (diff) | |
| parent | b5afa1a5be2909ed13f77ef0e0804bab75325198 (diff) | |
| download | rsyslog-c7e9e2123ee71fb868bbcff59225e009e21af590.tar.gz rsyslog-c7e9e2123ee71fb868bbcff59225e009e21af590.tar.xz rsyslog-c7e9e2123ee71fb868bbcff59225e009e21af590.zip | |
Merge branch 'v5-devel'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/imuxsock/imuxsock.c
runtime/rsyslog.h
Diffstat (limited to 'doc/Makefile.am')
| -rw-r--r-- | doc/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index b520198d..27471737 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -42,6 +42,7 @@ html_files = \ imfile.html \ imtcp.html \ imptcp.html \ + impstats.html \ imgssapi.html \ imrelp.html \ imsolaris.html \ |