* 2005-10-08

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@9358 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 3 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index b1eaaa8c3..2eb2cbecd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -162,7 +162,6 @@ Sat Sep 24 11:44:28 2005  Minero Aoki  <aamine@loveruby.net>
 
 	* test/net/http/test_http.rb: new file.
 
->>>>>>> 1.4662
 Sat Sep 24 08:54:05 2005  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/fileutils.rb (cd): no longer accept :noop option, related
diff --git a/version.h b/version.h
index c2f515b5b..369b463bd 100644
--- a/version.h
+++ b/version.h
@@ -1,14 +1,14 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2005-10-06"
+#define RUBY_RELEASE_DATE "2005-10-08"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20051006
+#define RUBY_RELEASE_CODE 20051008
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2005
 #define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 6
+#define RUBY_RELEASE_DAY 8
 
 RUBY_EXTERN const char ruby_version[];
 RUBY_EXTERN const char ruby_release_date[];