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

20 KiB

Raw Blame History

View Raw