summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-28 13:20:54 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-28 13:20:54 +0000
commit4ca19ae4d5a4878de8e73db5e4d5e112a5e18d1d (patch)
tree1f48e259e38d6d9795e149fe74d93952718b2b2d
parentd86ba46a65734423c05cb399c61f096db4f82712 (diff)
* version.h (RUBY_VERSION): bump RUBY_VERSION to 2.1.5.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@48176 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--version.h8
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 19dbbd025e..ef539bb3cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+火 10 28 22:19:44 2014 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+
+ * version.h (RUBY_VERSION): bump RUBY_VERSION to 2.1.5.
+
Mon Oct 27 20:20:14 2014 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/rexml/entity.rb: keep the entity size within the limitation.
diff --git a/version.h b/version.h
index 794e0d672c..8b932f7a86 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
-#define RUBY_VERSION "2.1.4"
-#define RUBY_RELEASE_DATE "2014-10-27"
-#define RUBY_PATCHLEVEL 265
+#define RUBY_VERSION "2.1.5"
+#define RUBY_RELEASE_DATE "2014-10-28"
+#define RUBY_PATCHLEVEL 266
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 27
+#define RUBY_RELEASE_DAY 28
#include "ruby/version.h"