aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-30 00:13:02 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-30 00:13:02 +0000
commit434a5f93adc435207aa0c2074558646753766a4d (patch)
tree90e9071996398e412b96eef00151e95585dc2a76 /ChangeLog
parentb62aadf0ddc080a1c3456bfa43227a9660819d2f (diff)
downloadruby-434a5f93adc435207aa0c2074558646753766a4d.tar.gz
* 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/trunk@33902 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog11
1 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 825120b916..3918829e8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Wed Nov 30 09:12:43 2011 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.
+
Wed Nov 30 09:09:37 2011 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/parser.c (parse): parse method can take an option file