diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-14 14:49:01 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-14 14:49:01 +0200 |
commit | 85ccd6e9b78d9136d5df3e082d9e971e0b8a7ef1 (patch) | |
tree | d36a73e60aa9dc497dc218c64d74d53268139fe3 /doc | |
parent | 01e5d51c57536acfa8e05d5b22c001a6cf0701d8 (diff) | |
parent | 01f2c7a7a3ee394028eb36d9709490cbc26c7369 (diff) | |
download | rsyslog-85ccd6e9b78d9136d5df3e082d9e971e0b8a7ef1.tar.gz rsyslog-85ccd6e9b78d9136d5df3e082d9e971e0b8a7ef1.tar.xz rsyslog-85ccd6e9b78d9136d5df3e082d9e971e0b8a7ef1.zip |
Merge branch 'omprog' into nextmaster
Conflicts:
ChangeLog
runtime/rsyslog.h
Diffstat (limited to 'doc')
-rw-r--r-- | doc/features.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/features.html b/doc/features.html index 17a995bf..626ff65d 100644 --- a/doc/features.html +++ b/doc/features.html @@ -127,7 +127,6 @@ community. Plus, it can be financially attractive: just think about how much les be to sponsor a feature instead of purchasing a commercial implementation. Also, the benefit of being recognised as a sponsor may even drive new customers to your business!</b> <ul> -<li>Finalize the DTN "planetary Internet" space ship mode output plugin <li>port it to more *nix variants (eg AIX and HP UX) - this needs volunteers with access to those machines and knowledge </li> <li>pcre filtering - maybe (depending on feedback) - |