ruby-cvs:19269
From: shyouhei ruby-lang.org
Date: Mon, 12 Mar 2007 00:01:47 +0900 (JST)
Subject: [ruby-cvs:19269] Ruby:r12033: * merge -c
shyouhei 2007-03-12 00:01:47 +0900 (Mon, 12 Mar 2007)
New Revision: 12033
Modified files:
branches/ruby_1_8_5/ChangeLog
branches/ruby_1_8_5/ext/dl/mkcallback.rb
branches/ruby_1_8_5/version.h
Log:
* merge -c 12028
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ext/dl/mkcallback.rb?r1=12033&r2=12032
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=12033&r2=12032
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=12033&r2=12032