Finished the merge!
authorMartin Read <mpread@chiark.greenend.org.uk>
Sun, 16 Mar 2014 21:06:43 +0000 (21:06 +0000)
committerMartin Read <mpread@chiark.greenend.org.uk>
Sun, 16 Mar 2014 21:06:43 +0000 (21:06 +0000)
commit60e5b6179beecd939a3e71d3bc0d8384a94f35a3
treef6a0c66a3d414f37eeedb62005dc7adbc4470a8a
parent3c2d1c5214c2edc92a20b839c61a2c904ef9aeec
Finished the merge!

Victrix Abyssi now incorporates approximately all of the engineering
improvements I made over the course of writing Obumbrata et Velata.
15 files changed:
MANIFEST
Makefile
cave.cc
core.hh
default.permobjs
default.permons
display-nc.cc
dungeon.cc
log.cc
map.cc
mapgen.hh
mon1.cc [new file with mode: 0644]
monsters.cc [deleted file]
obj1.cc [new file with mode: 0644]
objects.cc [deleted file]