Merge branch 'master-tademo' of ssh://taforever.com:222/ta-forever/featured_mods into tazero-alpha4d

# Conflicts: # .gitattributes
4 years ago · 4d2b845496
parent 6901a5ab47 85d74cf01e
commit 4d2b845496
2 changed files with 4 additions and 0 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -2,3 +2,4 @@ online.dll filter=lfs diff=lfs merge=lfs -text
 TA_Features_2013.ccx filter=lfs diff=lfs merge=lfs -text
 TAZ31.gp3 filter=lfs diff=lfs merge=lfs -text
 TotalA.exe filter=lfs diff=lfs merge=lfs -text
+TADEMO.UFO filter=lfs diff=lfs merge=lfs -text
--- a/TADEMO.UFO
+++ b/TADEMO.UFO