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

* master: (160 commits)
  Add doors correctly
  bug fixes for nhsub
  Generate oracle monsters after subroom
  Generate minetown guards after subrooms
  ...

Conflicts:
	src/do.c
	src/files.c
	src/hack.c
	src/mon.c
	src/vision.c

2015-04-01 17:40:25 -04:00

..

chain

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

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

gem

Make GOLDOBJ unconditional.

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

gnome

Manually fix botched NHDT-Branch expansions.

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

macosx

Fix lost mode bits.

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

Qt

Remove last mention of EXP_ON_BOTL

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

share

pull the globs outside the Meaty Sequence

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

tty

lint cleanup for tty 'gray'

2015-03-30 16:10:14 -07:00

win32

Merge branch 'master' into paxed-new_lev_comp

2015-03-21 19:39:48 +02:00

X11

X11 menu hack for ':'

2015-04-01 02:47:04 -07:00