aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/core_ext/hash
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-10-10 23:01:41 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-10-10 23:01:41 +0000
commite7040b09e8dc381c746a0a3b4dff540eebe7a35d (patch)
tree842c2cfeb39de4cb23d20f910297d6b6da7be221 /activesupport/lib/active_support/core_ext/hash
parentcff25aae90859d5f47d827b162b505f8b316b733 (diff)
downloadrails-e7040b09e8dc381c746a0a3b4dff540eebe7a35d.tar.gz
rails-e7040b09e8dc381c746a0a3b4dff540eebe7a35d.tar.bz2
rails-e7040b09e8dc381c746a0a3b4dff540eebe7a35d.zip
Rebundle Builder 2.1.2 but prefer a newer RubyGem if available.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7828 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib/active_support/core_ext/hash')
-rw-r--r--activesupport/lib/active_support/core_ext/hash/conversions.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb
index 6ac913e5b9..74fe577030 100644
--- a/activesupport/lib/active_support/core_ext/hash/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb
@@ -1,8 +1,8 @@
require 'date'
-require 'xml_simple'
require 'cgi'
require 'base64'
require 'builder'
+require 'xmlsimple'
# Extensions needed for Hash#to_query
class Object