diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-05 11:37:38 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-05 11:37:38 +0200 |
| commit | 9b3ed8408785d52d3b84d979ae1e5fa7ae3ce87f (patch) | |
| tree | 49b4f482a002911e8839f393e03c8aec482920b3 /doc/Makefile.am | |
| parent | d51aefc052377a2cee103a4d87c7c8dcf8c74081 (diff) | |
| parent | 33a2855c69bf1a86ca658fcbcee8eea6b6e23221 (diff) | |
| download | rsyslog-9b3ed8408785d52d3b84d979ae1e5fa7ae3ce87f.tar.gz rsyslog-9b3ed8408785d52d3b84d979ae1e5fa7ae3ce87f.tar.xz rsyslog-9b3ed8408785d52d3b84d979ae1e5fa7ae3ce87f.zip | |
Merge branch 'v3-stable' into v4-stable
Conflicts:
ChangeLog
configure.ac
doc/manual.html
doc/professional_support.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 a1f192ee..ca2ee71c 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -41,7 +41,6 @@ html_files = \ imrelp.html \ imuxsock.html \ imklog.html \ - professional_support.html \ queues.html \ src/queueWorkerLogic.dia \ queueWorkerLogic.jpg \ |