From: Pasi Kallinen <paxed@alt.org>
Date: Wed, 1 Apr 2015 13:09:53 +0000 (+0300)
Subject: Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource into paxed... 
X-Git-Tag: NetHack-3.6.0_RC01~492^2~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=323b8b40386d8c8a4adc1a8dc2298aa40e30dda0;p=nethack

Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource into paxed-new_lev_comp

Conflicts:
	src/trap.c
	sys/winnt/Makefile.msc
---

323b8b40386d8c8a4adc1a8dc2298aa40e30dda0
diff --cc .gitignore
index 4f8be313f,db40c9ab4..aedf39f50
--- a/.gitignore
+++ b/.gitignore
@@@ -32,9 -32,10 +32,11 @@@ cor
  Makefile
  
  # Win32-specific ignores
+ Debug/
+ Release/
  binary/
  build/
 +ipch/
  Nethack.sln
  Nethack.sdf
  Nethack.opensdf