Merge branch 'nwnds_acidchalk'

2021-07-30 07:56:33 -04:00
parent c5a358631d e5772c4db7
commit ba375e1833
692 changed files with 75779 additions and 0 deletions
--- a/nwnds_overland/ttd21_e101_01.mdl
+++ b/nwnds_overland/ttd21_e101_01.mdl
@@ -841,7 +841,11 @@ node trimesh object12
  Specular 0.0 0.0 0.0 
  shininess 1
  center -114.0 -107.0 42.0 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 74
    3.27 0.89 -2.25
    2.36 -1.96 -1.12