summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-04-30 07:09:56 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-04-30 07:09:56 +0000
commit13ed57b4a269e630e28aff1bcfb813f81b246b95 (patch)
tree3667196bec4d434ebbd9492fa1e39a34dca3d173 /version.h
parent20d4a375e2df9bde23b027581099ca5c8515950d (diff)
merge revision(s) 45320,45321: [Backport #9622]
* vm_insnhelper.c (vm_callee_setup_arg): turn a macro into an inline function. * vm_insnhelper.c (vm_callee_setup_arg): disable fastpath if splat argument, since argc may differ for each calls. [ruby-core:61422] [Bug #9622] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45748 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 739a05ce67..51ad7e9273 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2014-04-30"
-#define RUBY_PATCHLEVEL 468
+#define RUBY_PATCHLEVEL 469
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 4