summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-24 01:45:18 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-24 01:45:18 +0000
commit18b156e0bffc471b22f377cf269e5dc402e51796 (patch)
tree79693956c3e706524e5e30a64789c8e2a5208f01
parent1030cca852dc49d79167024e4ab6baccd233f8bf (diff)
downloadruby-18b156e0bffc471b22f377cf269e5dc402e51796.tar.gz
ruby-18b156e0bffc471b22f377cf269e5dc402e51796.tar.xz
ruby-18b156e0bffc471b22f377cf269e5dc402e51796.zip
fix ChangeLog.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog3
1 files changed, 1 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c0cade390..40a01792c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
Sat Feb 24 10:32:59 2007 Koichi Sasada <ko1@atdot.net>
- * common.mk: change vm_macro.def -> vm_macro.inc rule.
+ * common.mk: change vm_macro.def rule.
Sat Feb 24 10:38:05 2007 Minero Aoki <aamine@loveruby.net>
@@ -15,7 +15,6 @@ Sat Feb 24 07:31:35 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* test/win32ole/test_win32ole_variant.rb: add some test for
WIN32OLE_VARIANT.array, WIN32OLE_VARIANT#value=.
->>>>>>> .r11835
Fri Feb 23 18:37:55 2007 Minero Aoki <aamine@loveruby.net>
* test/ruby/test_yield.rb: new test.