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

..

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

Merge branch 'master' into derek-farming

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

tty

tty fix for bad curs positioning (-1,n)

2015-04-07 01:23:16 -07:00

win32

Add menucolors

2015-04-02 20:16:25 +03:00

X11

X11 menu hack for ':'

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