From 1030cca852dc49d79167024e4ab6baccd233f8bf Mon Sep 17 00:00:00 2001
From: ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 24 Feb 2007 01:41:46 +0000
Subject: * common.mk: change vm_macro.def -> vm_macro.inc rule.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11836 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 51b79feea..c0cade390 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Feb 24 10:32:59 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk: change vm_macro.def -> vm_macro.inc rule.
+
 Sat Feb 24 10:38:05 2007  Minero Aoki  <aamine@loveruby.net>
 
 	* ext/racc/cparse/cparse.c (cparse_params_mark): remove useless
@@ -11,6 +15,7 @@ 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.
-- 
cgit