???

2021-08-16 10:39:21 -04:00
parent a7f9fcdebe
commit b502bde656
2458 changed files with 62 additions and 1800044 deletions
--- a/nwnds_overland/bug01_n12_01.mdl
+++ b/nwnds_overland/bug01_n12_01.mdl
@@ -48,7 +48,11 @@ node aabb wok_194
  orientation 1.0 0.0 0.0 0.0
  wirecolor 0.0 0.0 0.0 
  multimaterial 31
+<<<<<<< HEAD
+    ttd21_sand01
+=======
    trd21_sand08
+>>>>>>> nwnds_acidchalk
    Dirt
    Obscuring
    Grass