From 3e0c9e00984599ae72a7ccc34544404ae59b8684 Mon Sep 17 00:00:00 2001
From: tadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 19 Jun 2009 13:37:04 +0000
Subject: due to conflict

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 97cd75a5c..a9d2b2e5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Fri Jun 19 22:21:17 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* numeric.c: edited rdoc.
+
+Fri Jun 19 21:56:01 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* rational.c (nurat_expt): delegates to complex when self is
+	  negative.  bacause Float#** does not produce complex.
+
+Fri Jun 19 21:40:58 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* numeric.c: edited rdoc.
+
+	* rational.c: ditto.
+
 Fri Jun 19 20:53:54 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* encoding.c (rb_enc_name_list): update RDoc.  [ruby-core:23926]
-- 
cgit