aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-26 03:16:32 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-26 03:16:32 +0000
commitae9bda718da8181d47f379a243e384f892448c50 (patch)
tree71da09987100de249dd0cb843ac52774ddb6a428
parent0928035b9f262a7611bd71f666ba1f8d79f3cf97 (diff)
downloadruby-ae9bda718da8181d47f379a243e384f892448c50.tar.gz
* version.h (RUBY_VERSION): 2.2.0 development has started.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44436 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--version.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 90d0d27d9f..f9165021c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Dec 26 10:49:14 2013 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * version.h (RUBY_VERSION): 2.2.0 development has started.
+
Thu Dec 26 10:27:53 2013 NAKAMURA Usaku <usa@ruby-lang.org>
* tool/merger.rb (tag): support 2.1.1 semi-automatic tagging and 2.2.0
diff --git a/version.h b/version.h
index 33f32caeda..defd983ea9 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
-#define RUBY_VERSION "2.1.0"
+#define RUBY_VERSION "2.2.0"
#define RUBY_RELEASE_DATE "2013-12-26"
#define RUBY_PATCHLEVEL -1
#define RUBY_BRANCH_NAME "trunk"