summaryrefslogtreecommitdiffstats
path: root/doc/Makefile.am
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-02-10 17:41:28 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-02-10 17:41:28 +0100
commit200e2b66308fb0ca861b5ba72d2b408b7f24aac3 (patch)
tree096885420457b9425fa8ccbbcdb1b005196a16a6 /doc/Makefile.am
parent7a0c7c61a57730ead60b7d4982247b76febb3bd9 (diff)
parentc8ebe623376bc025bf166ec333ac874c215de816 (diff)
downloadrsyslog-200e2b66308fb0ca861b5ba72d2b408b7f24aac3.tar.gz
rsyslog-200e2b66308fb0ca861b5ba72d2b408b7f24aac3.tar.xz
rsyslog-200e2b66308fb0ca861b5ba72d2b408b7f24aac3.zip
Merge branch 'beta' into master
Conflicts: ChangeLog tests/parsertest.sh
Diffstat (limited to 'doc/Makefile.am')
-rw-r--r--doc/Makefile.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 74d7fb2a..42a0e83c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -19,6 +19,7 @@ html_files = \
rsyslog_conf.html \
rsyslog-example.conf \
rsyslog_mysql.html \
+ rsyslog_pgsql.html \
rsyslog_packages.html \
rsyslog_high_database_rate.html \
rsyslog_php_syslog_ng.html \