lib/active_support.rb in activesupport-1.2.5 vs lib/active_support.rb in activesupport-1.3.0

@@ -20,17 +20,22 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
 $:.unshift(File.dirname(__FILE__))
+$:.unshift(File.dirname(__FILE__) + "/active_support/vendor")
 
-require 'active_support/class_attribute_accessors'
-require 'active_support/class_inheritable_attributes'
+require 'builder'
+
 require 'active_support/inflector'
 
 require 'active_support/core_ext'
 require 'active_support/clean_logger'
 require 'active_support/dependencies'
+require 'active_support/reloadable'
 
 require 'active_support/ordered_options'
+require 'active_support/option_merger'
 
-require 'active_support/values/time_zone'
+require 'active_support/values/time_zone'
+
+require 'active_support/json'
\ No newline at end of file