summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-03-01 09:41:08 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-03-01 09:41:08 +0000
commitb1bcb8265d7a06efeb876a9d70997ff50e90296d (patch)
tree92ae4e5642445d76568b1cadbfb2aa7bd821b9ed /version.h
parentffdaca1d748804f2b5ca2de612f17cf6c78d351b (diff)
merge revision(s) r33525: [Backport #6104]
* file.c (rb_file_join): honor input encodings than ASCII-8BIT. [ruby-core:40338] [Bug #5483] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34865 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r--version.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/version.h b/version.h
index a98f0afa4d..8341716000 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 153
+#define RUBY_PATCHLEVEL 154
-#define RUBY_RELEASE_DATE "2012-02-28"
+#define RUBY_RELEASE_DATE "2012-03-01"
#define RUBY_RELEASE_YEAR 2012
-#define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 28
+#define RUBY_RELEASE_MONTH 3
+#define RUBY_RELEASE_DAY 1
#include "ruby/version.h"