summaryrefslogtreecommitdiffstats
path: root/tests/imuxsock_logger_root.sh
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-07-11 10:08:13 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-07-11 10:08:13 +0200
commit398966be6d5a94d2602a08305b0533bf4a502a95 (patch)
tree6d2a7458311963fb4393ecc8549e1ece2062a7e5 /tests/imuxsock_logger_root.sh
parent68a01594000b788e530ee8f716545dafccf85982 (diff)
parentdc1dd284c28a863a0b000082aaeb62c39ff0e905 (diff)
downloadrsyslog-398966be6d5a94d2602a08305b0533bf4a502a95.tar.gz
rsyslog-398966be6d5a94d2602a08305b0533bf4a502a95.tar.xz
rsyslog-398966be6d5a94d2602a08305b0533bf4a502a95.zip
Merge branch 'v4-stable' into v5-stable
Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh
Diffstat (limited to 'tests/imuxsock_logger_root.sh')
0 files changed, 0 insertions, 0 deletions