diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-18 07:53:42 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-18 07:53:42 +0200 |
| commit | 2368ea0dfc317f7a599e1eb5bc5f3dcdb09b4943 (patch) | |
| tree | c7cc01849dc7aaade798bdb79e8af8ea3b13cffc /plugins/imtcp/imtcp.c | |
| parent | 6b228b1c75be53a07038b6941e92ce8bb3c1d6e0 (diff) | |
| parent | 38f657ff2ec0369c083571f4e5e30aba6f1cdbb7 (diff) | |
| download | rsyslog-2368ea0dfc317f7a599e1eb5bc5f3dcdb09b4943.tar.gz rsyslog-2368ea0dfc317f7a599e1eb5bc5f3dcdb09b4943.tar.bz2 rsyslog-2368ea0dfc317f7a599e1eb5bc5f3dcdb09b4943.zip | |
Merge branch 'v7-stable'
Conflicts:
runtime/libgcry.h
Diffstat (limited to 'plugins/imtcp/imtcp.c')
0 files changed, 0 insertions, 0 deletions