1 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ff25df39ff..b5c661d975 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Oct 22 10:57:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_enc_compatible): check if two objects have compatible
+	  encodings.
+
+	* encoding.c (enc_compatible_p): added Encoding.compatible?.
+
+	* include/ruby/encoding.h (rb_enc_compatible): prototype.
+
 Sun Oct 21 18:29:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* encoding.c (rb_enc_default, rb_enc_primary): return pointers to