diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-15 11:07:59 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-15 11:07:59 +0200 |
commit | 61ba5ff5955742b68a24d7b135ad07c29b48fa2f (patch) | |
tree | da96436375c623133fef91bb6cb9185e735bb8d4 /doc/gssapi.png | |
parent | 63d4de81ec485425231676d53813ff465249e800 (diff) | |
parent | b7fec51ba7b1042313b51dc27102fa0a9cebafb5 (diff) | |
download | rsyslog-61ba5ff5955742b68a24d7b135ad07c29b48fa2f.tar.gz rsyslog-61ba5ff5955742b68a24d7b135ad07c29b48fa2f.tar.bz2 rsyslog-61ba5ff5955742b68a24d7b135ad07c29b48fa2f.zip |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/ommail.html
queue.c
Diffstat (limited to 'doc/gssapi.png')
-rw-r--r-- | doc/gssapi.png | bin | 0 -> 35638 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/gssapi.png b/doc/gssapi.png Binary files differnew file mode 100644 index 00000000..c82baa52 --- /dev/null +++ b/doc/gssapi.png |