diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-11 11:49:32 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-11 11:49:32 +0200 |
| commit | 32e715929f5d946d7244db3bc0595842dd293dd9 (patch) | |
| tree | 2a154cd6984690e91569feebcd6924efa0eb91b7 /doc/Makefile.am | |
| parent | 89f7dddf36d57c9261464560e3b2c0fb8ea88fd2 (diff) | |
| parent | c664adfa1683763ae503f2da9e8d4d528d6634d1 (diff) | |
| download | rsyslog-32e715929f5d946d7244db3bc0595842dd293dd9.tar.gz rsyslog-32e715929f5d946d7244db3bc0595842dd293dd9.tar.xz rsyslog-32e715929f5d946d7244db3bc0595842dd293dd9.zip | |
Merge branch 'v4-stable-imptcp' into tmp
Conflicts:
Makefile.am
configure.ac
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 24a0ea74..72954e9c 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -37,6 +37,7 @@ html_files = \ omlibdbi.html \ imfile.html \ imtcp.html \ + imptcp.html \ imgssapi.html \ imrelp.html \ imsolaris.html \ |