diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-20 11:48:17 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-20 11:48:17 +0200 |
| commit | ac32d356b5b776e0ca549d5c689a8932af4c2171 (patch) | |
| tree | d8aa8631ec9b7aae850801be4076d71a652e483e /doc/Makefile.am | |
| parent | fd4a54698cee48da073622f7d6ac49c94ccb1808 (diff) | |
| parent | 1d86889922cb9232819b4451afce091e8a0ad938 (diff) | |
| download | rsyslog-ac32d356b5b776e0ca549d5c689a8932af4c2171.tar.gz rsyslog-ac32d356b5b776e0ca549d5c689a8932af4c2171.tar.xz rsyslog-ac32d356b5b776e0ca549d5c689a8932af4c2171.zip | |
Merge branch 'v5-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
doc/rsyslog_conf_modules.html
plugins/imrelp/imrelp.c
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 6adb14d4..fe96f960 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -49,6 +49,7 @@ html_files = \ imuxsock.html \ imklog.html \ pmlastmsg.html \ + mmsnmptrapd.html \ queues.html \ src/queueWorkerLogic.dia \ queueWorkerLogic.jpg \ |