~ chicken-core (chicken-5) 0235eb32de1c29052b2381d07e6fbf110df54a26
commit 0235eb32de1c29052b2381d07e6fbf110df54a26
Merge: 24763042 b69b0806
Author: Peter Bex <peter@more-magic.net>
AuthorDate: Mon Apr 4 21:24:55 2016 +0200
Commit: Peter Bex <peter@more-magic.net>
CommitDate: Mon Apr 4 21:24:55 2016 +0200
Merge branch 'master' into prerelease
Conflicts:
NEWS
README
buildversion
files.scm
manual/Getting started
manual/The User's Manual
manual/faq
diff --cc buildversion
index 6f0a4909,58426c10..ad96464c
--- a/buildversion
+++ b/buildversion
@@@ -1,1 -1,1 +1,1 @@@
- 4.10.0rc4
-4.10.1
++4.10.1
Trap