diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-24 16:28:49 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-24 16:28:49 +0200 |
| commit | 808bf660cf74a42428567d869c29bab207e87e9f (patch) | |
| tree | 02fb62abf81ec6664346304ed10d2d4753c96b90 /plugins/imtcp/imtcp.c | |
| parent | 3a2a5442d93c8f994d8a274acb604c156a059e5e (diff) | |
| parent | 79148e10312b12f3341aa68a5c9525cbe6e37a4d (diff) | |
| download | rsyslog-808bf660cf74a42428567d869c29bab207e87e9f.tar.gz rsyslog-808bf660cf74a42428567d869c29bab207e87e9f.tar.bz2 rsyslog-808bf660cf74a42428567d869c29bab207e87e9f.zip | |
Merge branch 'v7-stable'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/msg.c
Diffstat (limited to 'plugins/imtcp/imtcp.c')
0 files changed, 0 insertions, 0 deletions