diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-12-10 15:20:27 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-12-10 15:20:27 +0100 |
| commit | 6b1a023f256030d19e12bbaeaeb236e4d664d90a (patch) | |
| tree | 3b807b64f41681c51d92bc01143cbc9cb6154296 /doc | |
| parent | f716ff2349ba2d59d2540e5dd14fc08c67b68a0a (diff) | |
| parent | 054ae7bf174dbbf6721c0379d17383d0113dc90b (diff) | |
| download | rsyslog-6b1a023f256030d19e12bbaeaeb236e4d664d90a.tar.gz rsyslog-6b1a023f256030d19e12bbaeaeb236e4d664d90a.tar.xz rsyslog-6b1a023f256030d19e12bbaeaeb236e4d664d90a.zip | |
Merge branch 'debian_lenny' into v3-stable
Conflicts:
ChangeLog
configure.ac
doc/manual.html
net.h
plugins/imtcp/imtcp.c
plugins/imudp/imudp.c
runtime/net.c
runtime/rsyslog.h
tcps_sess.c
tcpsrv.c
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions