diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-27 14:17:43 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-27 14:17:43 +0200 |
| commit | 9eae07aa82db12205a31afc4ee2888ba50c3bc3a (patch) | |
| tree | e89b794ccedbae3c46aa406f29fc5ce7a7f915b7 /plugins/imtcp/imtcp.c | |
| parent | 6e77a7261ade955a6dc9ac1bae5fda7e14908fb0 (diff) | |
| parent | 8cd291a0c9eab23fa020d6560715a32c3370f78b (diff) | |
| download | rsyslog-9eae07aa82db12205a31afc4ee2888ba50c3bc3a.tar.gz rsyslog-9eae07aa82db12205a31afc4ee2888ba50c3bc3a.tar.bz2 rsyslog-9eae07aa82db12205a31afc4ee2888ba50c3bc3a.zip | |
Merge branch 'v4-beta' into v4-devel
Conflicts:
ChangeLog
Diffstat (limited to 'plugins/imtcp/imtcp.c')
0 files changed, 0 insertions, 0 deletions