Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Mapping merge driver: continued (#2803)

Browse Source 
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
This commit is contained in:
20kdc
2021-02-06 22:56:40 +00:00
committed by GitHub
parent 5cbb3f1222
commit 2f01d7899f
14 changed files with 1026 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -284,3 +284,7 @@ BuildFiles/Windows/Godot/*
# Windows image file caches
Thumbs.db
ehthumbs.db
# Merge driver stuff
Content.Tools/test/out.yml