diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-30 15:29:28 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-30 15:29:28 +0000 |
commit | 0eded3c0c3f22e28842be23bdebb8eda92401e8a (patch) | |
tree | 584cb451a51a80806fde5140d18fe3cf53fae6ea /version.h | |
parent | 85f3339697f48cdc292374d3ae6b079d67c22274 (diff) |
merge revision(s) r49964: [Backport #10957]
* parse.y (primary): empty parentheses at cmdarg can be null.
[ruby-core:68477] [Bug #10957]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50128 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r-- | version.h | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,10 +1,10 @@ #define RUBY_VERSION "2.1.5" -#define RUBY_RELEASE_DATE "2015-03-30" -#define RUBY_PATCHLEVEL 323 +#define RUBY_RELEASE_DATE "2015-03-31" +#define RUBY_PATCHLEVEL 324 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 30 +#define RUBY_RELEASE_DAY 31 #include "ruby/version.h" |