summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-08 05:49:26 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-08 05:49:26 +0000
commitbb74a0d0d18107f138c1f87c098f2de0cb82fe01 (patch)
treeb3776b09c905e2fb7da51c8c90ac2d960fd05088 /version.h
parent73c6469a00a5fadf26c35689231656a02092f594 (diff)
merge revision(s) 36306: [Backport #7296]
* test/win32ole/test_win32ole.rb (test_s_codepage_changed): FileSystemObject only supports ANSI or UTF-16LE encoding. Patch by h.shirosaki (Hiroshi Shirosaki) [ruby-trunk - Bug #6650] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37555 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r--version.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/version.h b/version.h
index 0e37133775..9a2bbb3eae 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 311
+#define RUBY_PATCHLEVEL 312
#define RUBY_RELEASE_DATE "2012-11-08"
#define RUBY_RELEASE_YEAR 2012