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_e102_01.mdl
+++ b/nwnds_overland/twm21_e102_01.mdl
@@ -1097,7 +1097,11 @@ node trimesh roc01.001
  specular 0 0 0
  shininess 1
  center -328 131 162.5
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 103
    -4.65 6.31 1.3
    1.72 -3.69 0.25