Merge branch 'jc/merge-symlink-ours-theirs'
[gitweb.git] / contrib / buildsystems / Generators /
drwxr-xr-x   parent (dest: contrib/buildsystems; base: 14b9d9aa0d2fc6fd81d7a392fc1cc951a9d9d115)
-rw-r--r-- 5063 QMake.pm
-rw-r--r-- 16344 Vcproj.pm