diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-12-18 09:37:34 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-12-18 09:37:34 +0000 |
| commit | 02401aac27956870b536694aac4106de58f156f8 (patch) | |
| tree | abad2b356a739b76e076cf7e1acdee58e4b01a16 | |
| parent | 01ceb2ee22ecc7a066880f29239e851b2d1398f3 (diff) | |
| download | ruby-02401aac27956870b536694aac4106de58f156f8.tar.gz ruby-02401aac27956870b536694aac4106de58f156f8.tar.xz ruby-02401aac27956870b536694aac4106de58f156f8.zip | |
conflicted.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1920 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -68,16 +68,13 @@ Mon Dec 17 15:19:32 2001 Tanaka Akira <akr@m17n.org> * missing/strftime.c: fix overflow by tm_year + 1900. + * lib/time.rb: use Time#utc_offset. + Mon Dec 17 00:02:04 2001 Guy Decoux <ts@moulon.inra.fr> -<<<<<<< ChangeLog * variable.c (find_class_path): should initialize iv_tbl if it's NULL. -======= - * lib/time.rb: use Time#utc_offset. - ->>>>>>> 1.655 Fri Dec 14 04:23:36 2001 Minero Aoki <aamine@loveruby.net> * lib/net/pop.rb: new method Net::POP3.APOP |