Merge branch 'master-tademo' into tatw-2.0b52

# Conflicts: # .gitattributes
add TADEMO.ufo
2022-04-02 16:54:01 +11:00 · 2022-04-02 16:48:58 +11:00 · 2022-02-23 19:19:57 +11:00 · 2022-02-23 19:10:44 +11:00 · 2022-02-23 06:47:24 +11:00 · 2022-02-22 23:45:02 +11:00
2 changed files with 4344 additions and 1 deletions
@@ -1,3 +1,4 @@
-TADEMO.UFO filter=lfs diff=lfs merge=lfs -text
 online.dll filter=lfs diff=lfs merge=lfs -text
+TA_Features_2013.ccx 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
Author	SHA1	Message	Date
Axle1975	0502b3f7c7	Merge branch 'master-tademo' into tatw-2.0b52 # Conflicts: # .gitattributes	2022-04-02 16:54:01 +11:00
Axle1975	85d74cf01e	add TADEMO.ufo	2022-04-02 16:48:58 +11:00
Axle1975	15593b5800	Merge branch 'master' into tatw-2.0b52	2022-02-23 19:19:57 +11:00
Axle1975	4ee5525cab	remove TA_Features_2013.ccx	2022-02-23 19:10:44 +11:00
Axle1975	a65dcb32ea	add missing TADEMO.UFO	2022-02-23 06:47:24 +11:00
Axle1975	265c3bdfa5	tatw-2.0b52	2022-02-22 23:45:02 +11:00
Axle1975	f0cea5dd21	initial commit	2022-02-09 16:53:31 +11:00