summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
1 files changed, 1 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c0cade390e..40a01792c6 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.