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

..

amiga

Make GOLDOBJ unconditional.

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

atari

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

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

be

Make WIZARD unconditional.

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

mac

Make WIZARD unconditional.

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

msdos

Make a few fixes to code that was confusing indent

2015-03-02 13:25:41 -05:00

os2

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

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

share

Win32 should use USERPROFILE and COMMONPROGRAMFILES

2015-03-25 22:35:24 -04:00

unix

Add sysconf for linux-X11

2015-03-28 10:00:44 +02:00

vms

Make LOADSYMSETS unconditional.

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

wince

Manually fix botched NHDT-Branch expansions.

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

winnt

throw in a windows sysconf skeleton

2015-03-21 15:54:30 -04:00