diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-25 06:36:54 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-25 06:36:54 +0000 |
commit | e04b5d25be58ceb85015a8cdda9be05c7fc9b482 (patch) | |
tree | 7c99bbb7bc808853e0637aa1c4a17106558886cf /ChangeLog | |
parent | c4b980ec687651abca2a117088615d47416beb53 (diff) |
merge revision(s) 49740:
* tool/merger.rb: support 2.1+ versioning scheme.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49741 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -1,3 +1,7 @@ +Wed Feb 25 15:36:26 2015 NARUSE, Yui <naruse@ruby-lang.org> + + * tool/merger.rb: support 2.1+ versioning scheme. + Tue Feb 24 17:41:27 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * time.c (time_zone_name): should be US-ASCII only if all 7-bits, |