* range.c (range_step): fixed integer overflow. [ruby-dev:31763]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@13421 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 7 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 5dbfe8a42e..3ee181c6f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,15 @@
+<<<<<<< current
 Sun Sep  9 09:14:45 2007  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* 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  <matz@ruby-lang.org>
+
+	* range.c (range_step): fixed integer overflow.  [ruby-dev:31763]
+
+>>>>>>> patched
 Sat Sep  8 10:22:20 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* struct.c (rb_struct_s_members): should raise TypeError instead