ruby-changes:42247
From: nagachika <ko1@a...>
Date: Tue, 29 Mar 2016 00:04:18 +0900 (JST)
Subject: [ruby-changes:42247] nagachika:r54321 (ruby_2_2): merge revision(s) 54288: [Backport #11870]
nagachika 2016-03-29 00:04:13 +0900 (Tue, 29 Mar 2016) New Revision: 54321 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54321 Log: merge revision(s) 54288: [Backport #11870] * ChangeLog: [ci skip] correct a mail address. cf. [Bug #11870] Modified directories: branches/ruby_2_2/ Modified files: branches/ruby_2_2/ChangeLog branches/ruby_2_2/version.h Index: ruby_2_2/version.h =================================================================== --- ruby_2_2/version.h (revision 54320) +++ ruby_2_2/version.h (revision 54321) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1 #define RUBY_VERSION "2.2.5" #define RUBY_RELEASE_DATE "2016-03-29" -#define RUBY_PATCHLEVEL 263 +#define RUBY_PATCHLEVEL 264 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 3 Index: ruby_2_2/ChangeLog =================================================================== --- ruby_2_2/ChangeLog (revision 54320) +++ ruby_2_2/ChangeLog (revision 54321) @@ -111,7 +111,7 @@ Wed Mar 9 04:15:20 2016 Eric Wong <e@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L111 * test/stringio/test_stringio.rb (test_binmode): new test [ruby-core:72699] [Bug #11945] -Wed Mar 9 03:53:37 2016 Tadashi Saito <tadashi_saito@d...> +Wed Mar 9 03:53:37 2016 Tadashi Saito <tad.a.digger@g...> * compile.c, cont.c, doc, man: fix common misspelling. [ruby-core:72466] [Bug #11870] Property changes on: ruby_2_2 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r54288 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/