diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-12 14:16:18 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-12 14:16:18 +0000 |
| commit | 3b91a5dc33e0e8dca3b3cc77805c872e9af68145 (patch) | |
| tree | 3f79d992fe11399df3e60fff06dc466cc999263a | |
| parent | e3624857f6bf738ba22d2f94071614dd2ae0d7a1 (diff) | |
ChangeLog conflict resolution
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@13433 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -1,15 +1,12 @@ -<<<<<<< current +Mon Sep 10 01:05:25 2007 Yukihiro Matsumoto <matz@ruby-lang.org> + + * range.c (range_step): fixed integer overflow. [ruby-dev:31763] + 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 |