From a8b2bda76008b5ff5f58cd60276c6f5d1f2b2538 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 26 Dec 2008 11:16:35 +0000
Subject: merges r20952 from trunk into ruby_1_9_1. * string.c
 (rb_external_str_new_with_enc): set ASCII-8BIT if   encoding is US-ASCII and
 string contains 8bit characters.

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index b78f25a57f..b65b5b5901 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -340,6 +340,11 @@ Mon Dec 22 18:00:36 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/tcltklib.c: fix wrong flag value.
 
+Mon Dec 22 14:35:59 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_external_str_new_with_enc): set ASCII-8BIT if
+	  encoding is US-ASCII and string contains 8bit characters.
+
 Mon Dec 22 12:26:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* cygwin/GNUmakefile.in (rubydll.def), win32/mkexports.rb
-- 
cgit v1.2.3