nobu	2008-08-08 13:04:39 +0900 (Fri, 08 Aug 2008)

  New Revision: 18432

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18432

  Log:
    * tool/resolve_changelog.rb (ChangeLog.Reader): fixed typo.

  Modified files:
    branches/mvm/ChangeLog
    branches/mvm/tool/resolve_changelog.rb
    branches/mvm/version.h

Index: mvm/ChangeLog
===================================================================
--- mvm/ChangeLog	(revision 18431)
+++ mvm/ChangeLog	(revision 18432)
@@ -1,3 +1,7 @@
+Fri Aug  8 13:04:19 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* tool/resolve_changelog.rb (ChangeLog.Reader): fixed typo.
+
 Thu Jul 31 14:11:00 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* tool/resolve_changelog.rb: extracted from tool/merge_from_trunk.rb.
Index: mvm/version.h
===================================================================
--- mvm/version.h	(revision 18431)
+++ mvm/version.h	(revision 18432)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-07-31"
+#define RUBY_RELEASE_DATE "2008-08-08"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080731
+#define RUBY_RELEASE_CODE 20080808
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2008
-#define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 31
+#define RUBY_RELEASE_MONTH 8
+#define RUBY_RELEASE_DAY 8
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: mvm/tool/resolve_changelog.rb
===================================================================
--- mvm/tool/resolve_changelog.rb	(revision 18431)
+++ mvm/tool/resolve_changelog.rb	(revision 18432)
@@ -1,13 +1,13 @@
 #! /usr/bin/ruby
 
-ChangeLog ||= "ChangeLog"
+defined?(ChangeLog) or ChangeLog = "ChangeLog"
 class << ChangeLog
   require 'date'
 
   module Reader
-    CONFLICT_BEGIN = "\n<<<<<<<".frozen
-    CONFLICT_SEP = "\n=======".frozen
-    CONFLICT_END = "\n>>>>>>>".frozen
+    CONFLICT_BEGIN = "\n<<<<<<<".freeze
+    CONFLICT_SEP = "\n=======".freeze
+    CONFLICT_END = "\n>>>>>>>".freeze
     LOGENTRY_PAT = /([A-Z][a-z]{2} [A-Z][a-z]{2} [ 1-9]\d \d\d:\d\d:\d\d \d{4})  .*>(?:\n(?:\t.*)?)+\n\n/
 
     def split_entry(ents)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/