summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-10-19 12:54:38 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-10-19 12:54:38 +0200
commited36822e37b3328dc52c70f96c0a099f224edc1a (patch)
treed271ea51301cac4daddaa482a4f9ff6e27b145df /tests
parent0972943f5265dca1f56dcb25bd361d40040bef87 (diff)
parent0a24b3afc093e16038da170458e2ecb68b363bdd (diff)
downloadrsyslog-ed36822e37b3328dc52c70f96c0a099f224edc1a.tar.gz
rsyslog-ed36822e37b3328dc52c70f96c0a099f224edc1a.tar.xz
rsyslog-ed36822e37b3328dc52c70f96c0a099f224edc1a.zip
Merge branch 'v4-stable' into v5-stable
Conflicts: configure.ac runtime/cfsysline.c tools/ompipe.c
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions