~ chicken-core (chicken-5) 067dc33371bb4d13b3fb5f6a6850cecfc726f01f
commit 067dc33371bb4d13b3fb5f6a6850cecfc726f01f
Merge: b2596318 c2f37304
Author: Peter Bex <peter@more-magic.net>
AuthorDate: Sat May 28 13:31:42 2016 +0200
Commit: Peter Bex <peter@more-magic.net>
CommitDate: Sat May 28 13:31:42 2016 +0200
Merge branch 'prerelease' into release
Conflicts:
NEWS
README
buildversion
manual/The User's Manual
diff --cc buildversion
index 1910ba9d,f2fac3ea..5385d687
--- a/buildversion
+++ b/buildversion
@@@ -1,1 -1,1 +1,1 @@@
- 4.10.0
-4.11.0rc2
++4.11.0rc2
Trap