diff options
author | Daniel Luz <dev@mernen.com> | 2010-08-09 05:06:00 -0300 |
---|---|---|
committer | Daniel Luz <dev@mernen.com> | 2010-08-09 05:06:00 -0300 |
commit | 844949a5b5266aac172bdc702b98754ad08811cf (patch) | |
tree | 8eff347e971555f310072102a1a9ac3674b2e963 | |
parent | 740a15d172cb44730aefd111eedb93e4d286df5b (diff) | |
parent | 72fae22ecd7c51fdf427de5b3e4bde81a244c42f (diff) | |
download | json-844949a5b5266aac172bdc702b98754ad08811cf.tar.gz |
Merge branch 'master' into unifiedv1.4.6-java
-rw-r--r-- | CHANGES | 4 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | lib/json/version.rb | 2 |
3 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +2010-08-09 (1.4.6) + * Fixed oversight reported in http://github.com/flori/json/issues/closed#issue/23, + always create a new object from the state prototype. + * Made pure and ext api more similar again. 2010-08-07 (1.4.5) * Manage data structure nesting depth in state object during generation. This should reduce problems with to_json method definŃ–tions that only have one @@ -1 +1 @@ -1.4.5 +1.4.6 diff --git a/lib/json/version.rb b/lib/json/version.rb index ef44e2a..a369b6c 100644 --- a/lib/json/version.rb +++ b/lib/json/version.rb @@ -1,6 +1,6 @@ module JSON # JSON version - VERSION = '1.4.5' + VERSION = '1.4.6' VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc: VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc: VERSION_MINOR = VERSION_ARRAY[1] # :nodoc: |