From bd5a79281c3c29efefceea8395652508799ba398 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 13 Dec 2008 01:02:36 +0000
Subject: merges r20624 from trunk into ruby_1_9_1. * encoding.c
 (rb_enc_set_default_internal): defines internal   encoding as nil.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20697 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 7fd759140..692ca70a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Thu Dec 11 13:17:04 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_enc_set_default_internal): defines internal
+	  encoding as nil.
+
+	* encoding.c (rb_locale_encoding): removed Encoding::LOCALE.
+
+	* encoding.c (rb_enc_set_default_external): ditto.
+
+	* encoding.c (rb_enc_set_default_internal): ditto.
+
+	* encoding.c (rb_enc_set_default_internal): defines internal
+	  encoding as nil.
+
 Thu Dec 11 10:25:25 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* test/ruby/test_bignum.rb (TestBignum#test_convert): remove
-- 
cgit