diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-07-01 15:09:07 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-07-01 15:09:07 +0200 |
| commit | 4fd98529572b57f494597a34f04ced96ef1031a2 (patch) | |
| tree | a2abace73c6cfcfa9db49d4c04ed2a1e831cef74 /doc/tls_cert.jpg | |
| parent | 78543b7e31ea9559108d15fd645862db7dd63913 (diff) | |
| parent | a16cbe655541421fefdcc852087219228bbc5c94 (diff) | |
| download | rsyslog-4fd98529572b57f494597a34f04ced96ef1031a2.tar.gz rsyslog-4fd98529572b57f494597a34f04ced96ef1031a2.tar.xz rsyslog-4fd98529572b57f494597a34f04ced96ef1031a2.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
conf.c
doc/Makefile.am
doc/manual.html
omfwd.c
plugins/omgssapi/omgssapi.c
This was a bit hard to merge; if there are problems, they
may be in the area of the new "comment in action line" code
that came from the beta.
Diffstat (limited to 'doc/tls_cert.jpg')
0 files changed, 0 insertions, 0 deletions