From 3b91a5dc33e0e8dca3b3cc77805c872e9af68145 Mon Sep 17 00:00:00 2001 From: matz Date: Wed, 12 Sep 2007 14:16:18 +0000 Subject: ChangeLog conflict resolution git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@13433 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ee181c6f2..a5a8427511 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,15 +1,12 @@ -<<<<<<< current +Mon Sep 10 01:05:25 2007 Yukihiro Matsumoto + + * range.c (range_step): fixed integer overflow. [ruby-dev:31763] + Sun Sep 9 09:14:45 2007 Tadayoshi Funaba * lib/date/format.rb (_strptime): now also attaches an element which denotes leftover substring if exists. -======= -Mon Sep 10 01:05:25 2007 Yukihiro Matsumoto - - * range.c (range_step): fixed integer overflow. [ruby-dev:31763] - ->>>>>>> patched Sat Sep 8 10:22:20 2007 Yukihiro Matsumoto * struct.c (rb_struct_s_members): should raise TypeError instead -- cgit v1.2.3