merge & sequencer: turn "Conflicts:" hint into a comment
[gitweb.git] / contrib / buildsystems / Generators /
drwxr-xr-x   parent (dest: contrib/buildsystems; base: 261f315b)
-rw-r--r-- 5063 QMake.pm
-rw-r--r-- 16344 Vcproj.pm