nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

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

Browse Source 
Conflicts:
	src/trap.c
	sys/winnt/Makefile.msc
This commit is contained in:
Pasi Kallinen
2015-04-01 16:09:53 +03:00
parent 2d6f9686a7 d3205d98d6
commit 323b8b4038
99 changed files with 4503 additions and 2521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sys/share/.gitattributes vendored
View File

@@ -1 +1 @@
Makefile.* filter=NHtext merge=NHsubst
Makefile.* NHSUBST