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
..
2015-03-31 09:50:02 -04:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:46:17 +02:00
2015-03-31 09:50:02 -04:00
2015-03-31 09:50:02 -04:00
2015-03-31 09:50:02 -04:00
2015-04-10 16:56:30 -04:00
2015-04-08 18:31:32 +03:00
2015-03-31 09:50:02 -04:00
2015-03-31 09:50:02 -04:00
2015-04-01 16:09:53 +03:00