diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-05 13:39:58 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-05 13:39:58 +0200 |
commit | cde0ac2b0c99a4ed1a7f47a14e0e84b57877a97b (patch) | |
tree | d7119adeb9fa3eb2d17f5fae7b8f6c06d64ce0b4 /plugins/omgssapi/omgssapi.c | |
parent | 189c0284c11f8a9a689baf0c1f122a06a421058b (diff) | |
parent | 54c375eb5b28d70fca023f7ca2fcc2cd0a4fa7ba (diff) | |
download | rsyslog-cde0ac2b0c99a4ed1a7f47a14e0e84b57877a97b.tar.gz rsyslog-cde0ac2b0c99a4ed1a7f47a14e0e84b57877a97b.tar.bz2 rsyslog-cde0ac2b0c99a4ed1a7f47a14e0e84b57877a97b.zip |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
tools/omfile.c
Diffstat (limited to 'plugins/omgssapi/omgssapi.c')
0 files changed, 0 insertions, 0 deletions