diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-05 14:09:06 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-05 14:09:06 +0200 |
| commit | 1be79730693be187e99319377cf110fba41cc801 (patch) | |
| tree | c09a297ad5e384ccd92d435b13c8a5c2fc11f110 /doc/Makefile.am | |
| parent | ae2d1c6fcb25867f2c6aa8e342a24afb43442e6a (diff) | |
| parent | 318adf58de35d7b8c6ca891b93c351220628586b (diff) | |
| download | rsyslog-1be79730693be187e99319377cf110fba41cc801.tar.gz rsyslog-1be79730693be187e99319377cf110fba41cc801.tar.xz rsyslog-1be79730693be187e99319377cf110fba41cc801.zip | |
Merge branch 'v4-stable' into v4-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
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 9ca0afe6..5beebf0e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -42,7 +42,6 @@ html_files = \ imsolaris.html \ imuxsock.html \ imklog.html \ - professional_support.html \ queues.html \ src/queueWorkerLogic.dia \ queueWorkerLogic.jpg \ |