diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-20 16:03:51 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-20 16:03:51 +0200 |
| commit | 534e07d738fc5c7f5464ab94a010cc7113dfad2c (patch) | |
| tree | 389432aabff3f72aee014452f7b449f41e829315 /doc/Makefile.am | |
| parent | 527edddb4646c24fa9a587601cd90d7a57a1fcf0 (diff) | |
| parent | 74000ea71eb47c19653e0cd7bbffb83d913c3923 (diff) | |
| download | rsyslog-534e07d738fc5c7f5464ab94a010cc7113dfad2c.tar.gz rsyslog-534e07d738fc5c7f5464ab94a010cc7113dfad2c.tar.xz rsyslog-534e07d738fc5c7f5464ab94a010cc7113dfad2c.zip | |
Merge branch 'v4-devel' into master
Conflicts:
plugins/imsolaris/imsolaris.c
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 42a0e83c..3d900cac 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -41,6 +41,7 @@ html_files = \ imtcp.html \ imgssapi.html \ imrelp.html \ + imsolaris.html \ imuxsock.html \ imklog.html \ professional_support.html \ |