summaryrefslogtreecommitdiffstats
path: root/tests/testsuites
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-10-21 12:14:27 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-10-21 12:14:27 +0200
commitd251f02a8aa9b6f5f3c7e0193ff0b285ef614c75 (patch)
tree5992b20aae167e0e04cbf9f9d2523fe969d63fab /tests/testsuites
parentb60420c67c5d9a797c8cf0d20c7bc58eb93c0abe (diff)
parent38e83becf605f128ebae26fd58c68c2ef38e946a (diff)
downloadrsyslog-d251f02a8aa9b6f5f3c7e0193ff0b285ef614c75.tar.gz
rsyslog-d251f02a8aa9b6f5f3c7e0193ff0b285ef614c75.tar.xz
rsyslog-d251f02a8aa9b6f5f3c7e0193ff0b285ef614c75.zip
Merge branch 'v4-devel'
Conflicts: runtime/wtp.c
Diffstat (limited to 'tests/testsuites')
0 files changed, 0 insertions, 0 deletions