summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-01-12 19:07:09 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-01-12 19:07:09 +0000
commitedfc3526a70e77f04ddc67f6c3dbe57c999c5d94 (patch)
tree8a5420db1c71f8fdd41071726d92333f02a4a24a /version.h
parent6fe410d42636fea9f6208d7ae8bcb76b44f5b43a (diff)
merge revision(s) 34278:
* cont.c (cont_restore_0): prevent optimizing out `sp'. sp is used for reserving a memory space with ALLOCA_N for restoring machine stack stored in cont->machine_stack, but clang optimized out it (and maybe #5851 is also caused by this). This affected TestContinuation#test_check_localvars. * cont.c (cont_restore_1): revert workaround introduced in r32201. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34288 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 29a81f857f..a98abb61a1 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 25
+#define RUBY_PATCHLEVEL 26
#define RUBY_RELEASE_DATE "2012-01-13"
#define RUBY_RELEASE_YEAR 2012