Bart House cd1b650fb7 Merge branch 'NetHack-3.6' ...

# Conflicts:
#	DEVEL/Developer.txt
#	include/config.h
#	include/decl.h
#	include/display.h
#	include/extern.h
#	include/global.h
#	include/hack.h
#	include/patchlevel.h
#	src/display.c
#	src/dothrow.c
#	src/makemon.c
#	src/monst.c
#	src/objnam.c
#	src/sp_lev.c
#	src/wield.c
#	src/zap.c
#	sys/share/pmatchregex.c
#	sys/winnt/Makefile.msc

2019-07-14 23:36:56 -07:00

..

.gitattributes

merge

2018-11-11 10:29:52 -05:00

.gitignore

Exclude all the Win32 build artifacts (Studio and otherwise)

2015-03-17 18:44:53 +02:00

bmptiles.c

some of Ray Chason's MSDOS and other fixes

2016-03-05 14:44:50 -05:00

gifread.c

Remove stale version control lines.

2015-05-25 09:21:31 +09:00

giftiles.c

cut and paste error

2016-03-07 08:46:57 -05:00

monsters.txt

clean master after moving of newer content to feature branch

2018-12-10 22:16:08 -05:00

objects.txt

fix #H3907 - wrinkled spellbook tile

2016-06-30 06:03:51 -07:00

other.txt

more other tile name fix-ups

2016-02-02 21:19:29 -05:00

ppmwrite.c

Remove stale version control lines.

2015-05-25 09:21:31 +09:00

renumtiles.pl

add missing copyright info

2018-04-25 16:54:50 -04:00

safeproc.c

Revert "Added experimental feature NEW_KEYBOARD_HIT."

2019-07-14 21:28:55 -07:00

thintile.c

some of Ray Chason's MSDOS and other fixes

2016-03-05 14:44:50 -05:00

tile2bmp.c

stale code

2019-07-14 12:17:47 -04:00

tile.doc

force expand unexpanded substitution variables

2018-04-25 15:36:11 -04:00

tile.h

add missing copyright info

2018-04-25 16:54:50 -04:00

tilemap.c

Moved pray.c globals to instance_globals.

2018-12-19 20:00:35 -08:00

tileset.c

fix #H5780 - file pointer freed twice

2017-07-30 18:17:00 -07:00

tiletext.c

add missing copyright info

2018-04-25 16:54:50 -04:00