projects / open-adventure.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c84d370 6ecd001)
Merge branch 'master' into magic-number 116/head
authorPeje Nilsson <peje66@gmail.com>
Mon, 19 Jun 2017 22:06:49 +0000 (00:06 +0200)
committerPeje Nilsson <peje66@gmail.com>
Mon, 19 Jun 2017 22:06:49 +0000 (00:06 +0200)

Trivial merge
This code is a forward-port of the Crowther/Woods Adventure 2.5 from 1995, last version in the main line of Colossal Cave Adventure development written by the original authors. The authors have given permission and encouragement to this release.