ruby-cvs:20649
From: matz ruby-lang.org
Date: Sat, 8 Sep 2007 10:24:01 +0900 (JST)
Subject: [ruby-cvs:20649] Ruby:r13412 (trunk): ChangeLog: conflict resolution
matz 2007-09-08 10:24:00 +0900 (Sat, 08 Sep 2007)
New Revision: 13412
Modified files:
trunk/ChangeLog
Log:
ChangeLog: conflict resolution
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13412&r2=13411