diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-04-08 09:50:26 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-04-08 09:50:26 +0200 |
commit | 5acc47276816962b4d4ec58fdbbef1def08d7a3f (patch) | |
tree | 7b6a750fbf35282ac33c670530d634c42b6a5bab /plugins/imtcp | |
parent | 755b56fdf4b542721b78b8badcb83f24f14c6495 (diff) | |
parent | 610137b49d5e4f8a0d448d8d361c042cf451a550 (diff) | |
download | rsyslog-5acc47276816962b4d4ec58fdbbef1def08d7a3f.tar.gz rsyslog-5acc47276816962b4d4ec58fdbbef1def08d7a3f.tar.bz2 rsyslog-5acc47276816962b4d4ec58fdbbef1def08d7a3f.zip |
Merge branch 'c7'
Conflicts:
ChangeLog
Diffstat (limited to 'plugins/imtcp')
0 files changed, 0 insertions, 0 deletions