From 5a00be2bf75939fd3bb05dabbdf46244eaa6bb43 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 7 May 2012 16:00:49 +0000
Subject: * ext/json: Merge JSON 1.7.1.  
 https://github.com/flori/json/commit/e5b9a9465c1159fae533bca320d950b772bcb4ac

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/json/lib/json/common.rb  | 1 +
 ext/json/lib/json/version.rb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'ext/json/lib/json')

diff --git a/ext/json/lib/json/common.rb b/ext/json/lib/json/common.rb
index cf7a8b9003..a30e4ce136 100644
--- a/ext/json/lib/json/common.rb
+++ b/ext/json/lib/json/common.rb
@@ -1,4 +1,5 @@
 require 'json/version'
+require 'json/generic_object'
 
 module JSON
   class << self
diff --git a/ext/json/lib/json/version.rb b/ext/json/lib/json/version.rb
index 63ebcf3195..b1cf47f295 100644
--- a/ext/json/lib/json/version.rb
+++ b/ext/json/lib/json/version.rb
@@ -1,6 +1,6 @@
 module JSON
   # JSON version
-  VERSION         = '1.6.6'
+  VERSION         = '1.7.1'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:
-- 
cgit v1.2.3