summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xtool/merger.rb3
-rw-r--r--version.h2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2cadac3113..05503ec9b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan 2 21:40:45 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * tool/merger.rb (#version_up): version.h date should be Japanese
+ locale date.
+
Mon Jan 2 21:36:56 2012 Luis Lavena <luislavena@gmail.com>
* configure.in: check -fno-omit-frame-pointer acceptance and usage
diff --git a/tool/merger.rb b/tool/merger.rb
index 48fddc38f2..a521b0ea16 100755
--- a/tool/merger.rb
+++ b/tool/merger.rb
@@ -58,7 +58,8 @@ def interactive str
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
diff --git a/version.h b/version.h
index 0a32b802ab..08764dfa10 100644
--- a/version.h
+++ b/version.h
@@ -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