projects / open-adventure.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9a32f4c 7ccef92)
Merge branch 'master' into actions-arithmetic
authorPeje Nilsson <peje66@gmail.com>
Fri, 16 Jun 2017 08:10:38 +0000 (10:10 +0200)
committerPeje Nilsson <peje66@gmail.com>
Fri, 16 Jun 2017 08:10:38 +0000 (10:10 +0200)
1  2 
actions.c patch | diff1 | diff2 | blob | history

diff --cc actions.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.