diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-05-21 16:55:11 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-05-21 16:55:11 +0200 |
commit | d25586126f5202e91a637b6f4aa89dd4b88b6e9e (patch) | |
tree | 3a958a2eb9fdaa6bfa5faf452952e5c96c1c23fe /tcpsrv.c | |
parent | 297384275f264ff4073838fe2006dc5180fd5a5b (diff) | |
parent | 8f53b0f4d5318e79eff23d9b96517cb8400d9c53 (diff) | |
download | rsyslog-d25586126f5202e91a637b6f4aa89dd4b88b6e9e.tar.gz rsyslog-d25586126f5202e91a637b6f4aa89dd4b88b6e9e.tar.xz rsyslog-d25586126f5202e91a637b6f4aa89dd4b88b6e9e.zip |
Merge branch 'beta'
Conflicts:
ChangeLog
Diffstat (limited to 'tcpsrv.c')
0 files changed, 0 insertions, 0 deletions