kosaki	2012-01-03 11:41:20 +0900 (Tue, 03 Jan 2012)

  New Revision: 34192

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

  Log:
    merge revision(s) 34190:
    
    * tool/merger.rb (#version_up): version.h date should be Japanese
      locale date.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/tool/merger.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34191)
+++ ruby_1_9_3/ChangeLog	(revision 34192)
@@ -1,3 +1,8 @@
+Mon Jan  2 21:40:45 2012  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* tool/merger.rb (#version_up): version.h date should be Japanese
+	  locale date.
+
 Mon Jan  2 21:36:56 2012  Luis Lavena  <luislavena@g...>
 
 	* configure.in: check -fno-omit-frame-pointer acceptance and usage
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34191)
+++ ruby_1_9_3/version.h	(revision 34192)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 13
+#define RUBY_PATCHLEVEL 14
 
 #define RUBY_RELEASE_DATE "2012-01-03"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/tool/merger.rb
===================================================================
--- ruby_1_9_3/tool/merger.rb	(revision 34191)
+++ ruby_1_9_3/tool/merger.rb	(revision 34192)
@@ -58,7 +58,8 @@
 end
 
 def version_up
-  d = Date.today
+  d = DateTime.now
+  d = d.new_offset(Rational(9,24)) # we need server locale (i.e. japanese) time
   system *%w'svn revert version.h'
   v, p = version
 

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