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

* master: (41 commits)
  Add more explicit helpless reasons
  add data.base suggestion for whistle
  Use existing function to count containers
  ...

Conflicts:
	src/do.c
	src/hack.c
	src/invent.c
	src/mon.c
	src/objnam.c

2015-03-29 17:32:12 -04:00

..

chain

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

2015-02-26 09:19:03 -05:00

gem

Make GOLDOBJ unconditional.

2015-02-27 19:33:40 -05:00

gnome

Manually fix botched NHDT-Branch expansions.

2015-03-01 20:32:28 -05:00

macosx

Fix lost mode bits.

2015-02-26 09:22:52 -05:00

Qt

Remove last mention of EXP_ON_BOTL

2015-03-01 10:26:24 +02:00

share

pull the globs outside the Meaty Sequence

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

tty

Use dark gray color for black glyphs in TTY

2015-03-29 15:51:11 +03:00

win32

Make GOLDOBJ unconditional.

2015-02-27 19:33:40 -05:00

X11

Manually fix botched NHDT-Branch expansions.

2015-03-01 20:32:28 -05:00