summaryrefslogtreecommitdiffstats
path: root/version.h
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-05 09:40:17 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-05 09:40:17 +0000
commit2e6152269e37b108c7b90bc1e74445ac3fca083c (patch)
treeb89cba3211fd0fbe01737e05612a19a348ed7c3b /version.h
parent83b3238d34a83ff2ebc4cb31a776e4855a775a84 (diff)
downloadruby-2e6152269e37b108c7b90bc1e74445ac3fca083c.tar.gz
ruby-2e6152269e37b108c7b90bc1e74445ac3fca083c.tar.xz
ruby-2e6152269e37b108c7b90bc1e74445ac3fca083c.zip
merges r25967, r25968 and r25969 from trunk into ruby_1_9_1. fixes a backport task #2099.
-- * parse.y (dyna_push_gen, dyna_pop_gen): adjust local vtable level for the case of syntax errors in method name or argument inside do block. [ruby-core:26961] -- * parse.y (dyna_push_gen): use rb_node_newnode() for ripper. [ruby-core:26961] -- * parse.y (dyna_push_gen, dyna_pop_gen): no needs to save both of args and vars. [ruby-core:26961] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@26014 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 4065833c5..c98fb8387 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 367
+#define RUBY_PATCHLEVEL 368
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1