diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-23 17:07:16 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-23 17:07:16 +0000 |
commit | 1ee1a2bddd1547cf02f22a14347744c7a88ca71a (patch) | |
tree | b02aa2ca0d60704d6647180d37842b48073bb2ce /version.h | |
parent | 265c1680960a55a302f10d042d88c68957cd8664 (diff) |
merge revision(s) r47111,r47212,r47451,r47452,r47680: [Backport #10245]
* test/minitest/test_minitest_unit.rb: removed obsoleted condition
for Ruby 1.8.
* test/ruby/test_time_tz.rb: ditto.
* test/ruby/test_time_tz.rb: Fix test error with tzdata-2014g.
[ruby-core:65058] [Bug #10245] Reported by Vit Ondruch.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r-- | version.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,6 +1,6 @@ #define RUBY_VERSION "2.1.4" #define RUBY_RELEASE_DATE "2014-09-24" -#define RUBY_PATCHLEVEL 243 +#define RUBY_PATCHLEVEL 244 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 9 |