~ chicken-core (chicken-5) e03ee6aa8c916d73eaf9da7657373dd42124ac4a

commit e03ee6aa8c916d73eaf9da7657373dd42124ac4a
Merge: 6aba0744 134c710f
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Tue Sep 14 15:02:16 2010 +0200
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Tue Sep 14 15:02:16 2010 +0200

    merged experimental (4.6.1)

diff --cc buildversion
index 28446a5e,f4fa8fcb..8ac28bf9
--- a/buildversion
+++ b/buildversion
@@@ -1,1 -1,1 +1,1 @@@
- 4.6.0
 -4.6.1
++4.6.1
diff --cc version.scm
index ca033cf6,70abb6e4..440550ae
--- a/version.scm
+++ b/version.scm
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD:version.scm
 +(define-constant +build-version+ "4.6.0")
++=======
+ (define-constant +build-version+ "4.6.1")
++>>>>>>> experimental:version.scm