???

2021-08-16 10:39:21 -04:00
parent a7f9fcdebe
commit b502bde656
2458 changed files with 62 additions and 1800044 deletions
--- a/nwnds_overland/ttd21_b114_01.mdl
+++ b/nwnds_overland/ttd21_b114_01.mdl
@@ -107,7 +107,11 @@ node trimesh Plane41
  Specular 0.0 0.0 0.0 
  shininess 1
  center 336.0 395.5 0.0 
+<<<<<<< HEAD
+  bitmap ttd21_sand01
+=======
  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 58
    -5.0 5.0 0.0
    5.0 5.0 0.0