diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-11 10:41:52 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-11 10:41:52 +0200 |
| commit | 28551c791bba444cdf1aef753ad15b9410d7a04a (patch) | |
| tree | 102cfb96ce0d2f6ec24cbb3fd41ebc777d5cf84f /tests | |
| parent | 44dab25c55b41219dd9e865c3aac93114757f5ba (diff) | |
| parent | cdae37d737cae680a96dead7a322b2ee975c92a1 (diff) | |
| download | rsyslog-28551c791bba444cdf1aef753ad15b9410d7a04a.tar.gz rsyslog-28551c791bba444cdf1aef753ad15b9410d7a04a.tar.xz rsyslog-28551c791bba444cdf1aef753ad15b9410d7a04a.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
runtime/queue.c
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions