summaryrefslogtreecommitdiff
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
commit52f8aba1e2063acd8279407104b0173925d2265a (patch)
tree6316b2a53dc99764691f803cf70b3538acaace69 /ChangeLog
parentb440480b7f2e7a7dc8b5e77f1d03decb2433641a (diff)
* 2005-10-08
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@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 e848452d9d..fcadde8b6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -60,7 +60,6 @@ Wed Sep 28 23:42:15 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
re.c (match_init_copy, rb_reg_init_copy), time.c (time_init_copy):
undocumented.
->>>>>>> 1.2673.2.1315
Wed Sep 28 23:09:23 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/delegate.rb: document update from James Edward Gray II