projects / open-adventure.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f9be57a 9c88649)
Merge branch 'master' into magic-number
authorPeje Nilsson <peje66@gmail.com>
Mon, 19 Jun 2017 21:44:48 +0000 (23:44 +0200)
committerPeje Nilsson <peje66@gmail.com>
Mon, 19 Jun 2017 21:44:48 +0000 (23:44 +0200)
1  2 
main.c patch | diff1 | diff2 | blob | history

diff --cc main.c
Simple 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.