diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-17 10:38:46 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-17 10:38:46 +0100 |
| commit | 0957820a1076d7fcf182ba60c12e5946c193545f (patch) | |
| tree | 2339489d05441895d1b221cab59fae36816c33eb /plugins/omgssapi | |
| parent | c9841fbd368e58674cc166e6186b2a29f9895211 (diff) | |
| parent | 9e28d47aaa506709a9e80e318527ceb4443cbffe (diff) | |
| download | rsyslog-0957820a1076d7fcf182ba60c12e5946c193545f.tar.gz rsyslog-0957820a1076d7fcf182ba60c12e5946c193545f.tar.xz rsyslog-0957820a1076d7fcf182ba60c12e5946c193545f.zip | |
Merge branch 'v4-devel'
Conflicts:
doc/rsyslog_conf_modules.html
gss-misc.c
plugins/imgssapi/imgssapi.c
plugins/imudp/imudp.c
plugins/imuxsock/imuxsock.c
runtime/glbl.c
runtime/glbl.h
runtime/net.c
Diffstat (limited to 'plugins/omgssapi')
0 files changed, 0 insertions, 0 deletions