summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authormame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-07-29 15:14:57 +0000
committermame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-07-29 15:14:57 +0000
commit2435ab175ffa9a270b2992c69f91c261e08f83a0 (patch)
treeda49b1d559734fc344e826ed522131c23ee7e17d /ChangeLog
parent14a56523d8f8f271210e573c6be4a22acda31773 (diff)
merges r28693, r28695 and r28703 from trunk into ruby_1_9_2.
-- * lib/rubygems/custom_require.rb, gem_prelude.rb: Load code from from gems properly. * lib/rubygems.rb: Load the custom require if --disable-rubygems was used. * gem_prelude.rb: Pull in rubygem's custom require [ruby-core:30846] * lib/rubygems.rb: Handle always having custom require available git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28786 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog17
1 files changed, 17 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index dde7cf6567..fdb3fbae52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+Wed Jul 21 15:22:17 2010 Evan Phoenix <evan@fallingsnow.net>
+
+ * lib/rubygems/custom_require.rb, gem_prelude.rb: Load code from
+ from gems properly.
+
+Tue Jul 20 11:35:11 2010 Evan Phoenix <evan@ruby-lang.org>
+
+ * lib/rubygems.rb: Load the custom require if --disable-rubygems
+ was used.
+
+Tue Jul 20 11:27:18 2010 Evan Phoenix <evan@ruby-lang.org>
+
+ * gem_prelude.rb: Pull in rubygem's custom require
+ [ruby-core:30846]
+
+ * lib/rubygems.rb: Handle always having custom require available
+
Tue Jul 13 20:58:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (RUBY_DEFAULT_ARCH): adjust for target