summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-23 08:21:08 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-23 08:21:08 +0000
commit44fcc21eb6d784359427d63030b5014ce4bbf911 (patch)
tree583f0ac823fbe432e4a35c56db81c0948269802c /ChangeLog
parent16b5c5e928b85c387a79f5ce846f68b6db98bd9d (diff)
merge revision(s) 29333:
* lib/pathname.rb (relative_path_from): backport r23093 and r25440 from ruby_1_9_2. [ruby-core:32415] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29333 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29884 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index fe5b7a869d..2df69679e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 23 17:09:14 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * lib/pathname.rb (relative_path_from): backport r23093 and r25440
+ from ruby_1_9_2. [ruby-core:32415]
+
Mon Nov 22 14:13:45 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c: fix checking version of GCC.