Merge branch 'master-tademo' into tavmod-4.3

# Conflicts: # .gitattributes
4 years ago · 5335f4c31b
parent c12d8f0662 85d74cf01e
commit 5335f4c31b
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
 ProTA.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