diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-14 07:55:37 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-14 07:55:37 +0000 |
| commit | 39432526b68e90906f25742b2736a2b2141f2d2d (patch) | |
| tree | 3f232a2aff8e6e61f591f9d799a9e6a19ff2e29b /ChangeLog | |
| parent | ac81a6e38d85ad623f699d4ed8dd319b5fb28d32 (diff) | |
merge revision(s) 33902:
* lib/rdoc/encoding.rb (RDoc::Encoding.read_file): fixup newline chars
on Windows.
see https://github.com/rdoc/rdoc/issues/87
* test/rdoc/test_rdoc_markup_pre_process.rb
(TestRDocMarkupPreProcess#test_include_file,
TestRDocMarkupPreProcess#test_include_file_encoding_incompatible):
follow above change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 11 |
1 files changed, 11 insertions, 0 deletions
@@ -1,3 +1,14 @@ +Tue Feb 14 16:52:17 2012 NAKAMURA Usaku <usa@ruby-lang.org> + + * lib/rdoc/encoding.rb (RDoc::Encoding.read_file): fixup newline chars + on Windows. + see https://github.com/rdoc/rdoc/issues/87 + + * test/rdoc/test_rdoc_markup_pre_process.rb + (TestRDocMarkupPreProcess#test_include_file, + TestRDocMarkupPreProcess#test_include_file_encoding_incompatible): + follow above change. + Tue Feb 14 16:34:11 2012 Shota Fukumori <sorah@tubusu.net> * test/rubygems/test_gem_commands_help_command.rb: Add one |