~ chicken-core (chicken-5) 03f82e045790af1bbc3f65471c59e6b71310e82c

commit 03f82e045790af1bbc3f65471c59e6b71310e82c
Merge: cac829ea 08c72b4e
Author:     Ivan Raikov <ivan@debian.oist.jp>
AuthorDate: Thu Apr 22 11:23:32 2010 +0900
Commit:     Ivan Raikov <ivan@debian.oist.jp>
CommitDate: Thu Apr 22 11:23:32 2010 +0900

    Merge commit '08c72b4e65858bcc8b10cb135e5b5aa3742892b5' into prerelease and set prerelease version to 4.5.0rc2.
    
    Conflicts:
            Makefile.cygwin
            README
            buildversion
            manual/The User's Manual
            version.scm

diff --cc Makefile.cygwin
index 4db26a7f,056bec46..457d4efe
--- a/Makefile.cygwin
+++ b/Makefile.cygwin
@@@ -48,8 -48,7 +48,6 @@@ RC_COMPILER = windre
  LINKER = gcc
  TARGET_RC_COMPILER ?= $(RC_COMPILER)
  
- 
--
  C_COMPILER_OPTIONS ?= -fno-strict-aliasing -DHAVE_CHICKEN_CONFIG_H
  ifdef DEBUGBUILD
  C_COMPILER_OPTIMIZATION_OPTIONS ?= -g -Wall -Wno-unused
diff --cc README
index 274a4c2e,bec62b7a..34aa0b7f
--- a/README
+++ b/README
@@@ -1,10 -1,10 +1,9 @@@
  
    README file for the CHICKEN Scheme system
--  (c) 2008-2009, The Chicken Team
++  (c) 2008-2010, The Chicken Team
    (c) 2000-2007, Felix L. Winkelmann
  
-   version 4.5.0rc1
 -  version 4.4.6
--
++  version 4.5.0rc2
  
   1. Introduction:
  
diff --cc buildversion
index 6e4ac884,b58299c3..26a9bb60
--- a/buildversion
+++ b/buildversion
@@@ -1,1 -1,1 +1,1 @@@
- 4.5.0rc1
 -4.4.6
++4.5.0rc2
diff --cc manual/The User's Manual
index ccd40d32,7768d445..10a124d6
--- a/manual/The User's Manual
+++ b/manual/The User's Manual
@@@ -6,8 -6,8 +6,9 @@@
  <img style="float:right; border-left:1px solid #ccc;border-bottom:1px solid #ccc;margin-left:1em;" src="http://www.call-with-current-continuation.org/chicken4.png" alt="Stylized picture of a chicken"/>
  </nowiki>
  
 -This is the manual for Chicken Scheme, version 4.4.6
 +This is the manual for Chicken Scheme, version 4.5.0rc1
 +
+ 
  ; [[Getting started]] : What is CHICKEN and how do I use it?
  
  ; [[Basic mode of operation]] : Compiling Scheme files.
diff --cc version.scm
index 2ab2439f,fe9739bf..e883a2a7
--- a/version.scm
+++ b/version.scm
@@@ -1,1 -1,1 +1,1 @@@
- (define-constant +build-version+ "4.5.0rc1")
 -(define-constant +build-version+ "4.4.6")
++(define-constant +build-version+ "4.5.0rc2")