From 631d5b519d367bf24662518dee7b41bf8dfddbba Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 12 Dec 2008 14:53:00 +0000
Subject: merges r20563 and r20588 from trunk into ruby_1_9_1. * pack.c
 (pack_pack): set US-ASCII and CODERANGE_7BIT   when quoted-printable ('M')
 and base64 ('m').   [ruby-dev:37284]

* pack.c (pack_unpack): ditto.

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 123d80238..2bfe34b85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Tue Dec  9 11:50:46 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* pack.c (pack_pck): fixed [ruby-dev:37295]. 
+	  Array#pack always has returned an US-ASCII string when
+	  the given format ended with 'u', 'M' or 'm'.
+
+Sat Dec  6 14:35:06 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* pack.c (pack_pack): set US-ASCII and CODERANGE_7BIT
+	  when quoted-printable ('M') and base64 ('m').
+	  [ruby-dev:37284]
+
+	* pack.c (pack_unpack): ditto.
+
 Thu Dec 11 11:51:36 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* encoding.c (rb_locale_encoding): removed Encoding::LOCALE.
-- 
cgit