cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-09 16:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #37976 from AutomaticFrenzy/patch/dmi-merger

Browse Source 
Add a Python script to fix DMI conflicts
This commit is contained in:
Jordan Brown
2018-05-25 11:54:36 -04:00
committed by letterjay
parent cc088d9113
commit e37a9a36ed
8 changed files with 446 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.gitattributes vendored
View File

@@ -1,12 +1,6 @@
# dmm map merger hook
# needs additional setup, see tools/mapmerge/install.txt
*.dmm merge=merge-dmm
# dmi icon merger hook
# needs additional setup, see tools/dmitool/merging.txt
*.dmi merge=merge-dmi
# merger hooks, run tools/hooks/install.bat or install.sh to set up
*.dmm merge=dmm
*.dmi merge=dmi
# force changelog merging to use union
html/changelog.html merge=union