1 files changed, 16 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a5859815f3..fa167ddf2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Thu Mar  3 00:36:29 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rexml/encoding.rb (REXML::Encoding#encoding=): store @encoding
+	  a String which means the name of the encoding.
+	  this partially revert r29646.
+
+	* lib/rexml/document.rb: follow above.
+
+	* lib/rexml/output.rb: ditto.
+
+	* lib/rexml/parsers/baseparser.rb: ditto.
+
+	* lib/rexml/source.rb: ditto.
+
+	* lib/rexml/xmldecl.rb: ditto.
+
 Wed Mar  2 23:19:56 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* string.c (str_byte_substr): return nil for negative length.