Merge branch 'master' into win32-x64-working

Browse Source

Conflicts:
	include/config.h
	include/extern.h
	src/do.c
	src/files.c
	src/hack.c
	src/mkobj.c
	src/mon.c
	src/objnam.c
	src/vision.c
	sys/share/pcmain.c
	win/share/other.txt
	win/share/renumtiles.pl

...

This commit is contained in:

nhmall

2015-04-12 00:15:40 -04:00

parent f448dfbbd6 1a8cfeaef3

commit 2cfa05cde1

68 changed files with 18299 additions and 16667 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

3836

src/hack.c

File diff suppressed because it is too large Load Diff