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:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -32,6 +32,8 @@ core
|
||||
Makefile
|
||||
|
||||
# Win32-specific ignores
|
||||
Debug/
|
||||
Release/
|
||||
binary/
|
||||
build/
|
||||
ipch/
|
||||
|
||||
Reference in New Issue
Block a user