nhmall 83a7513c13 Merge branch 'master' into win32-x64-working ...

Conflicts:
	src/do_name.c
	src/trap.c
	src/zap.c
	win/X11/winmenu.c

2015-04-12 10:35:00 -04:00

..

.gitignore

Exclude all the Win32 build artifacts (Studio and otherwise)

2015-02-13 13:26:05 -05:00

gifread.c

pull in the recent unconditionals merge from master

2015-02-27 21:25:00 -05:00

monsters.txt

tile renumbering

2005-02-20 20:04:01 +00:00

objects.txt

tribute post-merge smoothing

2015-04-12 10:31:26 -04:00

other.txt

Renumber other.txt tiles

2015-04-07 21:34:57 +03:00

ppmwrite.c

pull in the recent unconditionals merge from master

2015-02-27 21:25:00 -05:00

renumtiles.pl

fix misnumbered tiles in other.txt

2015-04-10 23:46:05 -04:00

thintile.c

pull in the recent unconditionals merge from master

2015-02-27 21:25:00 -05:00

tile2bmp.c

pull in the recent unconditionals merge from master

2015-02-27 21:25:00 -05:00

tile.doc

pull in the recent unconditionals merge from master

2015-02-27 21:25:00 -05:00

tile.h

pull in the recent unconditionals merge from master

2015-02-27 21:25:00 -05:00

tilemap.c

Merge branch 'master' into win32-x64-working

2015-04-05 23:42:15 -04:00

tiletext.c

pull in the recent unconditionals merge from master

2015-02-27 21:25:00 -05:00