From 855af7d4163e661a495e8bf03bfa101d682bc9f7 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 6 Feb 2004 13:54:26 +0000 Subject: remove conflict git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@5637 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index c6e4792b1..7103247e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,13 +3,6 @@ Fri Feb 6 22:48:16 2004 Dave Thomas * lib/rdoc/generators/html_generator.rb (gen_url): Support https in RDoc hyperlinks -<<<<<<< ChangeLog -Thu Jan 29 22:41:53 2004 Dave Thomas - - * 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 * 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 * util.c (mblen): fix overrun. [ruby-dev:22672] +Thu Jan 29 22:41:53 2004 Dave Thomas + + * 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 * ext/openssl/ossl_x509hame.c (ossl_x509name_initialize): change @@ -139,7 +137,6 @@ Thu Jan 29 15:33:23 2004 GOTOU Yuuzou * sample/openssl/gen_csr.rb: use OpenSSL::X509::Name.parse. ->>>>>>> 1.2673.2.103 Tue Jan 27 11:09:29 2004 FUKUMOTO Atsushi * ext/socket/socket.c (s_recvfrom): sending length should be an -- cgit