diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-09 13:44:52 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-09 13:44:52 +0200 |
| commit | a5b4cb1681174ad221a8440422e4cd0da0e32064 (patch) | |
| tree | 95abe0feed6e106025fc8d85d4ad28a36c06eb34 /tools | |
| parent | 845c6f59b91e9988f856556cbb0e88e275e8e591 (diff) | |
| parent | 0cade5118fbf6b7af6f34b53255e4e73b9578176 (diff) | |
| download | rsyslog-a5b4cb1681174ad221a8440422e4cd0da0e32064.tar.gz rsyslog-a5b4cb1681174ad221a8440422e4cd0da0e32064.tar.bz2 rsyslog-a5b4cb1681174ad221a8440422e4cd0da0e32064.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
tcpsrv.c
tcpsrv.h
Note: we have a slight inconsistency, as interface version v4 was already
used for tcpsrv in this branch. We accept this inconsistency.
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions