diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-06-11 17:59:22 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-06-11 17:59:22 +0200 |
commit | 712bf14db29995feeea0c1bfa285de2ddecaec4d (patch) | |
tree | 1f9d7c96cf4b8a8230edfe882c3c28c3e050b986 /plugins/omgssapi/omgssapi.c | |
parent | d16f0496debce57afca7398917367fc71bfec298 (diff) | |
parent | 98d731554b61245532af4ed3d47385095b9b8980 (diff) | |
download | rsyslog-712bf14db29995feeea0c1bfa285de2ddecaec4d.tar.gz rsyslog-712bf14db29995feeea0c1bfa285de2ddecaec4d.tar.bz2 rsyslog-712bf14db29995feeea0c1bfa285de2ddecaec4d.zip |
Merge branch 'master-mmfields'
Conflicts:
Makefile.am
configure.ac
Diffstat (limited to 'plugins/omgssapi/omgssapi.c')
0 files changed, 0 insertions, 0 deletions