summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-21 19:35:06 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-21 19:35:06 +0000
commit410699b90e2bb1d2ac2c0d49c204d2576d8335a1 (patch)
tree8fcc308582d82a660721b377b90d2e5688f3206a /version.h
parentc7edfc37fff5a1b6636e6582a882419cc32942c9 (diff)
merge revision(s) r44681: [Backport #9440]
* ext/thread/thread.c (Init_thread): ConditionVariable and Queue are not able to copy. [ruby-core:59961] [Bug #9440] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50044 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 b5e5cc26ff..43a6135df1 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.1.5"
-#define RUBY_RELEASE_DATE "2015-03-18"
-#define RUBY_PATCHLEVEL 319
+#define RUBY_RELEASE_DATE "2015-03-22"
+#define RUBY_PATCHLEVEL 320
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 18
+#define RUBY_RELEASE_DAY 22
#include "ruby/version.h"