Merge branch 'nd/remote-plural-ours-plus-theirs'
[gitweb.git] / contrib / buildsystems / Generators /
drwxr-xr-x   parent (dest: contrib/buildsystems; base: 7a7d0854ff3cb1bc5b95e9295b9c11089d9a75a6)
-rw-r--r-- 5063 QMake.pm
-rw-r--r-- 16344 Vcproj.pm