Merge branch 'nd/remote-plural-ours-plus-theirs'
[git] / contrib / buildsystems /
drwxr-xr-x   ..
-rw-r--r-- 1100 Generators.pm
drwxr-xr-x - Generators
-rwxr-xr-x 11033 engine.pl
-rwxr-xr-x 1208 generate
-rwxr-xr-x 6675 parse.pl