From: nhmall <nhmall@nethack.org>
Date: Thu, 19 Dec 2019 23:37:02 +0000 (-0500)
Subject: Merge branch 'copperwater-hallutraps-3.7' into copperwater-3.7
X-Git-Tag: NetHack-3.7.0_WIP~113^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bcee4e694acc8ea803bee4a4448f8f0c58f4c146;p=nethack

Merge branch 'copperwater-hallutraps-3.7' into copperwater-3.7
---

bcee4e694acc8ea803bee4a4448f8f0c58f4c146
diff --cc doc/fixes37.0
index 03c0b824e,43e042d95..3f2c55378
--- a/doc/fixes37.0
+++ b/doc/fixes37.0
@@@ -48,7 -48,7 +48,8 @@@ Platform- and/or Interface-Specific Ne
  
  NetHack Community Patches (or Variation) Included
  -------------------------------------------------
+ hallucinatory trap names from github pull request #174
 +autounlock feature originally from unnethack in github pull request #228
  
  
  Code Cleanup and Reorganization