Merge branch 'master' into derek-farming

Browse Source

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

...

This commit is contained in:

Derek S. Ray

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

parent 07e0bc592c 04dd85e138

commit 32619fa8cc

67 changed files with 4905 additions and 3014 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

win/share/other.txt

+282 -225

File diff suppressed because it is too large Load Diff