Merge branch 'da/mergetool-xxdiff-hotkey' into maint
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 6d1f93acfa79568ff60633ff09aa752f43cf8f5f)
-rw-r--r-- 6375 apache.conf
-rw-r--r-- 339 broken-smart-http.sh
-rwxr-xr-x 513 error.sh
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf