diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-06 17:32:29 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-06 17:32:29 +0200 |
commit | 40e70777ea9e9d72b87a387ca3fe67ce45c3e00f (patch) | |
tree | 88687f796b0efd4c2c61aaca4feb5977933f9f14 /doc/Makefile.am | |
parent | e4c926bfbca3aab3fe34fc9cfedb7343423de016 (diff) | |
parent | 80ff634c841d692c1d9f335b88e225d6ce7317f7 (diff) | |
download | rsyslog-40e70777ea9e9d72b87a387ca3fe67ce45c3e00f.tar.gz rsyslog-40e70777ea9e9d72b87a387ca3fe67ce45c3e00f.tar.xz rsyslog-40e70777ea9e9d72b87a387ca3fe67ce45c3e00f.zip |
Merge branch 'v4-devel'
Conflicts:
ChangeLog
Makefile.am
configure.ac
doc/rsyslog_conf_modules.html
runtime/rsyslog.h
tests/Makefile.am
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 e4e7696b..4b39e633 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -108,6 +108,7 @@ html_files = \ gssapi.html \ licensing.html \ ommail.html \ + omuxsock.html \ omrelp.html \ syslog_parsing.html \ troubleshoot.html \ |