diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-07 16:00:49 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-07 16:00:49 +0000 |
| commit | 5a00be2bf75939fd3bb05dabbdf46244eaa6bb43 (patch) | |
| tree | 7a4e8c43342493d270ea16116506295751621c85 /ext/json/lib | |
| parent | 5f7be3150f0bffb6a958770c61270302123774c3 (diff) | |
| download | ruby-5a00be2bf75939fd3bb05dabbdf46244eaa6bb43.tar.gz | |
* 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
Diffstat (limited to 'ext/json/lib')
| -rw-r--r-- | ext/json/lib/json/common.rb | 1 | ||||
| -rw-r--r-- | ext/json/lib/json/version.rb | 2 |
2 files changed, 2 insertions, 1 deletions
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: |