Merge branch 'da/mergetool-meld'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 48f662dd74ed9e909a8ba878152f88a238a97b4f)
-rw-r--r-- 4622 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