diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-02-06 13:54:26 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-02-06 13:54:26 +0000 |
| commit | 855af7d4163e661a495e8bf03bfa101d682bc9f7 (patch) | |
| tree | 9392a96e4fd4eb42276bd2179cc78b77b5805676 | |
| parent | 237eab276683028848a6d0f8b0a90aadcc1bbf91 (diff) | |
| download | ruby-855af7d4163e661a495e8bf03bfa101d682bc9f7.tar.gz ruby-855af7d4163e661a495e8bf03bfa101d682bc9f7.tar.xz ruby-855af7d4163e661a495e8bf03bfa101d682bc9f7.zip | |
remove conflict
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@5637 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 13 |
1 files changed, 5 insertions, 8 deletions
@@ -3,13 +3,6 @@ Fri Feb 6 22:48:16 2004 Dave Thomas <dave@pragprog.com> * lib/rdoc/generators/html_generator.rb (gen_url): Support https in RDoc hyperlinks -<<<<<<< ChangeLog -Thu Jan 29 22:41:53 2004 Dave Thomas <dave@pragprog.com> - - * lib/rdoc/generators/html_generator.rb: Allow 'link:' in Tidylinks. - THis means you can write "see f1[link:files/f1_rb.html]". - -======= Fri Feb 6 22:41:22 2004 NAKAMURA, Hiroshi <nakahiro@sarion.co.jp> * lib/pp.rb (PPInspectTest#test_to_s_with_iv): rollback the previous @@ -120,6 +113,11 @@ Thu Jan 29 23:56:00 2004 WATANABE Hirofumi <eban@ruby-lang.org> * util.c (mblen): fix overrun. [ruby-dev:22672] +Thu Jan 29 22:41:53 2004 Dave Thomas <dave@pragprog.com> + + * lib/rdoc/generators/html_generator.rb: Allow 'link:' in Tidylinks. + THis means you can write "see f1[link:files/f1_rb.html]". + Thu Jan 29 15:33:23 2004 GOTOU Yuuzou <gotoyuzo@notwork.org> * ext/openssl/ossl_x509hame.c (ossl_x509name_initialize): change @@ -139,7 +137,6 @@ Thu Jan 29 15:33:23 2004 GOTOU Yuuzou <gotoyuzo@notwork.org> * sample/openssl/gen_csr.rb: use OpenSSL::X509::Name.parse. ->>>>>>> 1.2673.2.103 Tue Jan 27 11:09:29 2004 FUKUMOTO Atsushi <fukumoto@nospam.imasy.or.jp> * ext/socket/socket.c (s_recvfrom): sending length should be an |