diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-31 18:38:47 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-31 18:38:47 +0100 |
| commit | 2f9a557cd0be3c29ec1dde42c89341ed50be48b4 (patch) | |
| tree | 08661c29d52279f39b626665bbb97f525f02be3d /plugins/omgssapi/omgssapi.c | |
| parent | bc675b2def53dff83a8d5a018ca3939af7824d41 (diff) | |
| parent | 70b8ba19a314a1ce9fdb01062fcd7dd470882a8a (diff) | |
| download | rsyslog-2f9a557cd0be3c29ec1dde42c89341ed50be48b4.tar.gz rsyslog-2f9a557cd0be3c29ec1dde42c89341ed50be48b4.tar.bz2 rsyslog-2f9a557cd0be3c29ec1dde42c89341ed50be48b4.zip | |
Merge branch 'master' into master-ruleeng
Conflicts:
plugins/ommysql/ommysql.c
Diffstat (limited to 'plugins/omgssapi/omgssapi.c')
0 files changed, 0 insertions, 0 deletions