diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-02 12:18:49 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-02 12:18:49 +0200 |
| commit | 82818fe15c6da23e4a790618b2fdda53d0ed66e3 (patch) | |
| tree | 22b1be451e30d7254a4f479ce52434235092f07e /java | |
| parent | 24b62834801043bf2d9560b0cca3967e5762bea1 (diff) | |
| parent | d13ec67f9ab9c59a88952af6aec372fd082401ca (diff) | |
| download | rsyslog-82818fe15c6da23e4a790618b2fdda53d0ed66e3.tar.gz rsyslog-82818fe15c6da23e4a790618b2fdda53d0ed66e3.tar.xz rsyslog-82818fe15c6da23e4a790618b2fdda53d0ed66e3.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
tcpsrv.c
Diffstat (limited to 'java')
0 files changed, 0 insertions, 0 deletions