summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-27 02:54:02 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-27 02:54:02 +0000
commitdd1e757adb87340ac13354c3228a5c2e1c0b1bb4 (patch)
tree6f0977f9a84bc4d0ac8030c7458ff70a440b5485 /version.h
parentadc25ed110871abb5ba13fea789ee911dd8ce348 (diff)
merges r24761 and r24999 from trunk into ruby_1_9_1.
-- * compile.c (iseq_compile_each): op_asgn to aref should return rhs. [ruby-core:25387] -- * compile.c (iseq_compile_each), parse.y (stmt, arg): arg_concat() on op_asgn was inversed. [ruby-core:25629] [Bug #2050] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25940 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 9cc7030bca..288ad26dde 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 341
+#define RUBY_PATCHLEVEL 342
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1