Merge branch 'en/d-f-conflict-fix'
[gitweb.git] / block-sha1 /
drwxr-xr-x   parent (dest: ; base: 9f44723d1a2c6a97306a7160deeab621e08bea7a)
-rw-r--r-- 8584 sha1.c
-rw-r--r-- 692 sha1.h