From 73cbb8f3941c078b7f08c0ac66041fe74966f8ed Mon Sep 17 00:00:00 2001
From: duerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 21 Dec 2007 07:24:39 +0000
Subject: Fri Dec 21 16:25:25 2007  Martin Duerst  <duerst@it.aoyama.ac.jp>

	* common.mk, transcode_data_iso_8859.c: renamed to
	  transcode_data_one_byte.c.



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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 22938adaf..f8d9f5b02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 21 16:25:25 2007  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* common.mk, transcode_data_iso_8859.c: renamed to
+	  transcode_data_one_byte.c.
+
 Fri Dec 21 16:10:30 2007  Shigeo Kobayashi  <shigeo@tinyforest.jp>
 
 	* ext/bigdecimal/bigdecimal.c (VpMidRound): Round method bug
@@ -31,6 +36,7 @@ Fri Dec 21 15:31:59 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* encoding.c (rb_to_encoding): returns default encoding if no
 	  corresponding encoding found.
 
+>>>>>>> .r14414
 Fri Dec 21 15:24:22 2007  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/imap.rb (initialize): accept service name.  changed
@@ -67,6 +73,7 @@ Fri Dec 21 13:54:05 2007  Tanaka Akira  <akr@fsij.org>
 
 	* re.c: change "character encodings differ" error messages.
 
+>>>>>>> .r14409
 Fri Dec 21 13:46:58 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* encoding.c (rb_enc_register): set encoding constant.
-- 
cgit