Merge branch 'jk/add-p-skip-conflicts'
[gitweb.git] / gitweb /
drwxr-xr-x   parent (dest: ; base: 3c524002d67471f8ef5455ef0e5ce3e6fc846b32)
-rw-r--r-- 14977 INSTALL
-rw-r--r-- 5641 Makefile
-rw-r--r-- 2438 README
-rwxr-xr-x 243345 gitweb.perl
drwxr-xr-x - static