summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-10-08 10:19:51 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-10-08 10:19:51 +0000
commit205fe5606697a5ff237336c5ddb062eafa0e969d (patch)
treee346c7dd1448d19aeb551a8097f0ebe97c56605e /ChangeLog
parent127897875ad7288ae4133fdaff69dbfa3c863c5b (diff)
downloadruby-205fe5606697a5ff237336c5ddb062eafa0e969d.tar.gz
ruby-205fe5606697a5ff237336c5ddb062eafa0e969d.tar.xz
ruby-205fe5606697a5ff237336c5ddb062eafa0e969d.zip
* 2005-10-08
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@9358 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b1eaaa8c3..2eb2cbecd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -162,7 +162,6 @@ Sat Sep 24 11:44:28 2005 Minero Aoki <aamine@loveruby.net>
* test/net/http/test_http.rb: new file.
->>>>>>> 1.4662
Sat Sep 24 08:54:05 2005 Minero Aoki <aamine@loveruby.net>
* lib/fileutils.rb (cd): no longer accept :noop option, related