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_b030_05.mdl
+++ b/nwnds_overland/ttd21_b030_05.mdl
@@ -351,7 +351,11 @@ node trimesh ground08
  specular 0 0 0
  shininess 1
  center 0 64 0
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 4
    5 5.64 0
    -5 5.64 0