Merge branch 'master-tademo' into tacc-3.9.02

# Conflicts: # .gitattributes
4 years ago · 58dd5d74e3
parent 8fce5b52b5 85d74cf01e
commit 58dd5d74e3
2 changed files with 4 additions and 0 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -3,3 +3,4 @@ TA_Features_2013.ccx filter=lfs diff=lfs merge=lfs -text
 TA_Ais_2013.ccx filter=lfs diff=lfs merge=lfs -text
 TotalA.exe filter=lfs diff=lfs merge=lfs -text
 rev31.gp3 filter=lfs diff=lfs merge=lfs -text
+TADEMO.UFO filter=lfs diff=lfs merge=lfs -text
--- a/TADEMO.UFO
+++ b/TADEMO.UFO