5 Commits

Author SHA1 Message Date
20kdc
2f01d7899f Mapping merge driver: continued (#2803)
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2021-02-06 23:56:40 +01:00
Tyler Young
51c24150d3 Code Styling defaults & C# Git Diff support (#593)
uncomment csharp diff logic in .gitattributes
2020-02-06 16:16:15 +01:00
clusterfack
8d7293bdd2 Import engine as submodule
Trying an https link to allow submodule downloading without SSH authentication
2017-05-30 22:50:10 -05:00
clusterfack
20affd2ace Revert "Import engine as submodule (#1)" (#2)
This reverts commit 8adabfab67.
2017-05-30 22:20:55 -05:00
Matt Smith
8adabfab67 Import engine as submodule (#1) 2017-05-30 21:09:47 -05:00