summaryrefslogtreecommitdiffstats
path: root/version.h
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-31 13:04:32 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-31 13:04:32 +0000
commitc3701f1fc4dfca522a6b6db2e7892c061e8811c3 (patch)
tree345626c7cb060dcd898f32f8f12ccdd3c5e644fa /version.h
parentadaca8a60bd63672752b281df65ec7cd8f007ff6 (diff)
merges r24757 and r24758 from trunk into ruby_1_9_1.
-- * compile.c (iseq_compile_each): &&= and ||= should return rhs. [ruby-dev:39163] (#1996), [ruby-core:25143] -- * compile.c (iseq_compile_each): &&= and ||= should return rhs. [ruby-dev:39163] (#1996), [ruby-core:25143] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25589 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 a0c7ed0dc..9e0a1c2e0 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 314
+#define RUBY_PATCHLEVEL 315
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1