diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-28 02:25:14 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-28 02:25:14 +0000 |
commit | baac6078e39a917beab1fa203205c38b319608b5 (patch) | |
tree | 44462fb2b0443a39e6d87b52cf640b72fc0fda33 /version.h | |
parent | a152da5fcd247d723cfc5e77a4a33ab1877ff636 (diff) |
merges r30587 from trunk into ruby_1_9_2.
--
* ext/psych/lib/psych/visitors/json_tree.rb (visit_String): JSON
strings should be dumped with double quotes. [ruby-core:34186]
* test/psych/test_json_tree.rb: test for double quotes
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30687 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r-- | version.h | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,13 +1,13 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 164 +#define RUBY_PATCHLEVEL 165 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2011 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 27 -#define RUBY_RELEASE_DATE "2011-01-27" +#define RUBY_RELEASE_DAY 28 +#define RUBY_RELEASE_DATE "2011-01-28" #include "ruby/version.h" |