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

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

diff --cc .gitignore
index 4f8be313f9174d5c65d4babe8f2758c01dc65d1b,db40c9ab4b0807e8c44b0a1115b4802a9eddede8..aedf39f50571e227f88a0f69153b9e5f472364fb
--- 1/.gitignore
--- 2/.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

diff --cc dat/endgame.des
Simple merge

diff --cc include/extern.h
Simple merge

diff --cc include/obj.h
Simple merge

diff --cc include/patchlevel.h
Simple merge

diff --cc src/dig.c
Simple merge

diff --cc src/mkmaze.c
Simple merge

diff --cc src/mon.c
Simple merge

diff --cc src/topten.c
Simple merge

diff --cc src/trap.c
Simple merge

diff --cc sys/winnt/Makefile.msc
Simple merge