summaryrefslogtreecommitdiffstats
path: root/plugins/omgssapi/omgssapi.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-06-16 12:59:55 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-06-16 12:59:55 +0200
commit98348ae03d217d1971c54ff135b6a5ce1dff7087 (patch)
treecced038bdf003e375a77a47aa7ea7b4183553664 /plugins/omgssapi/omgssapi.c
parent4af40abc0a9cdc9f328830b6074f6182f43c171a (diff)
parent74b2b24f508be90d20961304d5e3cce648f3eb7c (diff)
downloadrsyslog-98348ae03d217d1971c54ff135b6a5ce1dff7087.tar.gz
rsyslog-98348ae03d217d1971c54ff135b6a5ce1dff7087.tar.xz
rsyslog-98348ae03d217d1971c54ff135b6a5ce1dff7087.zip
Merge branch 'master' into omfile
Conflicts: ChangeLog runtime/msg.h tcps_sess.c tcpsrv.c tools/syslogd.c
Diffstat (limited to 'plugins/omgssapi/omgssapi.c')
0 files changed, 0 insertions, 0 deletions