diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-15 11:03:07 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-15 11:03:07 +0200 |
commit | b7fec51ba7b1042313b51dc27102fa0a9cebafb5 (patch) | |
tree | ebe76258f2aecbe771ea8fe2dab633f8e7e278f9 /doc/gssapi.png | |
parent | bcd2661167998b7a986f31e5f6f3b691ab0a662a (diff) | |
parent | f4b26f77ab03a1bacf2c49a1982fabe2a58ccb9d (diff) | |
download | rsyslog-b7fec51ba7b1042313b51dc27102fa0a9cebafb5.tar.gz rsyslog-b7fec51ba7b1042313b51dc27102fa0a9cebafb5.tar.bz2 rsyslog-b7fec51ba7b1042313b51dc27102fa0a9cebafb5.zip |
Merge branch 'v3-stable' into beta
Conflicts:
ChangeLog
doc/manual.html
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 |