diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-08 01:24:00 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-08 01:24:00 +0000 |
| commit | be031bf3cb836541436f2e7c8136a572e358acf1 (patch) | |
| tree | b86bc78ac991daccd33aecde1ea5472e25155f42 | |
| parent | 4e2f3bd9eb3eb3f8ac7e4feae0a5280244868cdd (diff) | |
| download | ruby-be031bf3cb836541436f2e7c8136a572e358acf1.tar.gz ruby-be031bf3cb836541436f2e7c8136a572e358acf1.tar.xz ruby-be031bf3cb836541436f2e7c8136a572e358acf1.zip | |
ChangeLog: conflict resolution
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13412 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 13 |
1 files changed, 5 insertions, 8 deletions
@@ -1,16 +1,13 @@ -<<<<<<< current -Sat Sep 8 09:33:09 2007 Tadayoshi Funaba <tadf@dotrb.org> - - * lib/date/format.rb (str[fp]time): now check specifications more - strictly. - -======= Sat Sep 8 10:05:14 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * struct.c (rb_struct_s_members): check if __members__ is an array to prevent segmentation fault. [ruby-dev:31759] ->>>>>>> patched +Sat Sep 8 09:33:09 2007 Tadayoshi Funaba <tadf@dotrb.org> + + * lib/date/format.rb (str[fp]time): now check specifications more + strictly. + Sat Sep 8 02:56:31 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * test/ruby/test_fiber.rb (TestFiber::test_throw): uncaught throw |