aboutsummaryrefslogtreecommitdiffstats
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
commitea6b149fd8249ece25926b64d87940af32e800be (patch)
treee346c7dd1448d19aeb551a8097f0ebe97c56605e /ChangeLog
parent2b291d3806d85d6a87963dfcc88750e89e147b2c (diff)
downloadruby-ea6b149fd8249ece25926b64d87940af32e800be.tar.gz
* 2005-10-08
git-svn-id: svn+ssh://ci.ruby-lang.org/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 b1eaaa8c33..2eb2cbecd3 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