Derek S. Ray 32619fa8cc Merge branch 'master' into derek-farming ...

Reverse merge before final reintegration.

* master: (40 commits)
  Fix magic mapped dark room symbols
  Disclose extinct species alongside genocided ones
  ...

Conflicts:
	doc/fixes35.0
	src/do.c
	src/files.c
	src/invent.c
	src/objnam.c
	sys/share/pcmain.c

2015-04-10 16:56:30 -04:00

..

.gitignore

Exclude all the Win32 build artifacts (Studio and otherwise)

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

gifread.c

A batch of manual header var additions.

2015-03-17 18:45:42 +02:00

monsters.txt

tile renumbering

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

objects.txt

pull the globs outside the Meaty Sequence

2015-03-20 11:37:50 -04:00

other.txt

Renumber other.txt tiles

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

ppmwrite.c

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

renumtiles.pl

pull the globs outside the Meaty Sequence

2015-03-20 11:37:50 -04:00

thintile.c

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

tile2bmp.c

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

tile.doc

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

tile.h

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

tilemap.c

Manually fix botched NHDT-Branch expansions.

2015-03-17 18:46:55 +02:00

tiletext.c

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00