summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-05 16:05:10 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-05 16:05:10 +0000
commit665f7a2ff1ce1c73118eb06e13a35d480ab89c3c (patch)
treec842f8ba1c0bd960579fdae8035a2ddc497f1889 /version.h
parentb5623f98638b433ac5363869dde77d03b91348a2 (diff)
merge revision(s) 49376,49387,49389: [Backport #10761]
* st.c (st_numhash): mix float value for flonum * hash.c (rb_any_hash): ditto * benchmark/bm_hash_aref_flo.rb: new benchmark * benchmark/bm_hash_ident_flo.rb: ditto [Bug #10761] * benchmark/bm_marshal_dump_flo.rb: new benchmark for [Bug #10761] * marshal.c (w_object, marshal_dump): use indetity tables for arbitrary VALUE keys, because of performance of FLONUM. [Bug #10761] * marshal.c (obj_alloc_by_klass, marshal_load): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49513 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r--version.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/version.h b/version.h
index 03f76f28e3..1e9378d959 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.2.0"
-#define RUBY_RELEASE_DATE "2015-02-05"
-#define RUBY_PATCHLEVEL 38
+#define RUBY_RELEASE_DATE "2015-02-06"
+#define RUBY_PATCHLEVEL 39
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 5
+#define RUBY_RELEASE_DAY 6
#include "ruby/version.h"