projects / open-adventure.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29121a8 49edca4)
Merge branch 'master' into actions-arithmetic 84/head
authorPeje Nilsson <peje66@gmail.com>
Thu, 15 Jun 2017 15:33:15 +0000 (17:33 +0200)
committerPeje Nilsson <peje66@gmail.com>
Thu, 15 Jun 2017 15:33:15 +0000 (17:33 +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.