diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-14 14:10:52 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-14 14:10:52 +0200 |
| commit | 28af40670e9dc1a85a24dfcbb093ddc1171e151f (patch) | |
| tree | e3cd7ed2f7f1980aff5e49eff2aab18bfe7f7bbb /tests/1.rstest | |
| parent | fdc25fb14b6acc1484a59f55746bd4041e0103ff (diff) | |
| parent | bcd956d4d500040808b920e468529da94a1e33c8 (diff) | |
| download | rsyslog-28af40670e9dc1a85a24dfcbb093ddc1171e151f.tar.gz rsyslog-28af40670e9dc1a85a24dfcbb093ddc1171e151f.tar.xz rsyslog-28af40670e9dc1a85a24dfcbb093ddc1171e151f.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
tcpsrv.c
Diffstat (limited to 'tests/1.rstest')
0 files changed, 0 insertions, 0 deletions