diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-11 01:47:12 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-11 01:47:12 +0000 |
| commit | 9edcd5d16bbde5f07022fff25bb68b536b2fcd21 (patch) | |
| tree | 524200a0fe0f599a610b5612be40a6b03854a7b1 /ChangeLog | |
| parent | 607b8e0732f6aaa83cf807ba22034968d40f0ea6 (diff) | |
| download | ruby-9edcd5d16bbde5f07022fff25bb68b536b2fcd21.tar.gz | |
resolve conflict.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24841 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Fri Sep 11 10:38:33 2009 URABE Shyouhei <shyouhei@ruby-lang.org> + + * lib/net/http.rb (Net::HTTPHeader::encode_kvpair): also call to_s + to k. A patch from swdyh <youhei@gmail.com> + http://github.com/swdyh/ruby/tree/c847f43c2ccb679b9ff728f8b1b16c6ceeb57f39 + Fri Sep 11 09:45:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * dln.c (aix_loaderror): get rid of using uninitialized value in the |