From 30c85e95199e4e0cc5b716ab8580be205a8ee15d Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 29 Jan 2009 17:14:18 +0000
Subject: merges r21875 from trunk into ruby_1_9_1. * load.c
 (rb_feature_provided): should not calculate len by pointer   subtraction
 because feature may be a expanded path.   [ruby-core:21267]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21881 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 5bcc2f538..017c80b8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-Thu Jan 29 14:08:59 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Jan 29 16:22:41 2009  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* load.c (rb_feature_provided): should not calculate len by pointer
+	  subtraction because feature may be a expanded path.
+	  [ruby-core:21267]
+
+Thu Jan 29 14:12:15 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (BASERUBY): erases RUBYOPT at the test.
 
 	* configure.in (OBJCOPY): not used on Windows.
 
-- 
cgit