diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-13 06:34:48 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-13 06:34:48 +0000 |
commit | b7b9aa6609b0f49c1f7d2935e5a1e3a13223957e (patch) | |
tree | 0e574d1901db92231cf972eedb82e0eb20e1cce3 /version.h | |
parent | 88cc04cf424fd02bf3111beb4ee419e541ee6ba2 (diff) |
merge revision(s) 39208:
* ext/json: merge JSON 1.7.7.
This includes security fix. [CVE-2013-0269]
https://github.com/flori/json/commit/d0a62f3ced7560daba2ad546d83f0479a5ae2cf2
https://groups.google.com/d/topic/rubyonrails-security/4_YvCpLzL58/discussion
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39215 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r-- | version.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,11 +1,11 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2013-02-09" +#define RUBY_RELEASE_DATE "2013-02-13" #define RUBY_PATCHLEVEL -1 #define RUBY_BRANCH_NAME "trunk" #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 9 +#define RUBY_RELEASE_DAY 13 #include "ruby/version.h" |