mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
resolve conflict.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24841 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
607b8e0732
commit
9edcd5d16b
1 changed files with 6 additions and 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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue