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/twm21_e101_01.mdl
+++ b/nwnds_overland/twm21_e101_01.mdl
@@ -903,7 +903,11 @@ node trimesh object12
  Specular 0.0 0.0 0.0 
  shininess 1
  center -111.0 -308.0 344.0 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 88
    -0.01 -5.29 2.76
    -2.11 1.92 2.99