diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-20 10:08:24 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-20 10:08:24 +0200 |
| commit | 760b23aac9718c77ab6f5c56dc06ad173690a92b (patch) | |
| tree | be465081896848eea8cadbb35c0eb602a71c7202 /plugins/imtcp/imtcp.c | |
| parent | 88154352094b2014bacaed2e5ee15c9b77ed19d5 (diff) | |
| parent | 1e6469e92096f9f6c04cb80479ab049a9caa4fa2 (diff) | |
| download | rsyslog-760b23aac9718c77ab6f5c56dc06ad173690a92b.tar.gz rsyslog-760b23aac9718c77ab6f5c56dc06ad173690a92b.tar.bz2 rsyslog-760b23aac9718c77ab6f5c56dc06ad173690a92b.zip | |
Merge branch 'v6-stable' into v6-devel
Conflicts:
ChangeLog
Diffstat (limited to 'plugins/imtcp/imtcp.c')
0 files changed, 0 insertions, 0 deletions