Merge branch 'fc/rerere-conflict-style' into maint
[git] / contrib / buildsystems / Generators /
drwxr-xr-x   ..
-rw-r--r-- 5063 QMake.pm
-rw-r--r-- 16344 Vcproj.pm