diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-02 12:59:54 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-02 12:59:54 +0200 |
| commit | 466e0264015ba5ed100c120365c31a250105c0bb (patch) | |
| tree | 237518d3abf8ba6378a7cb3a47762512f1401f33 /java | |
| parent | 82818fe15c6da23e4a790618b2fdda53d0ed66e3 (diff) | |
| parent | 921bebc8ee203c0569332c636515c4de036dfcf9 (diff) | |
| download | rsyslog-466e0264015ba5ed100c120365c31a250105c0bb.tar.gz rsyslog-466e0264015ba5ed100c120365c31a250105c0bb.tar.xz rsyslog-466e0264015ba5ed100c120365c31a250105c0bb.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
tcpsrv.c
Diffstat (limited to 'java')
0 files changed, 0 insertions, 0 deletions