summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-11 00:39:09 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-11 00:39:09 +0000
commit01d1a35a77f6dc2e522d27379d5a52b8e8a1e9eb (patch)
tree77895cd7c466f40a1284e2fee1d4c2ed540dd30b /version.h
parent3360e3e7eafd0a7c19af8dc13b9adba4baee0c48 (diff)
merges r32342 from trunk into ruby_1_9_2.
-- * class.c (Init_class_hierarchy): should name BasicObject explicitly. * variable.c (rb_const_defined_0): should not check for superclasses as const_get. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32925 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 5ad0e1719d..d098eb76da 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 310
+#define RUBY_PATCHLEVEL 311
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1