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

Conflicts:
	src/trap.c
	sys/winnt/Makefile.msc
This commit is contained in:
Pasi Kallinen
2015-04-01 16:09:53 +03:00
99 changed files with 4503 additions and 2521 deletions

4
util/.gitattributes vendored
View File

@@ -1,2 +1,2 @@
*.pl filter=NHtext merge=NHsubst
*.[ly] filter=NHtext merge=NHsubst
*.pl NHSUBST
*.[ly] NHSUBST