Merge branch 'en/d-f-conflict-fix'
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: 3f29dd6c2344c56aad263a82a773ead0d9fded30)
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11623 Makefile
-rwxr-xr-x 1289 git-gui--askpass
-rwxr-xr-x 94314 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows