diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-03 12:24:25 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-03 12:24:25 +0000 |
commit | b8f2f0e5611833d1f93c261a772859667e971749 (patch) | |
tree | f7103c9bc0df71eb0223d6224d33138c89f5eaa1 /version.h | |
parent | c039cd8ecb3187e55f736cb9b78108620eb736e8 (diff) |
merges a part of r31742, r31947, r31894, r3202 and r32287 from trunk
into ruby_1_9_2.
--
* ex/tk/extconf.rb: support for the latest ActiveTcl with mingw.
--
* ext/tk/extconf.rb: fails on Mac OS X [Ruby 1.9 - Bug #4853]
--
* ext/tk/extconf.rb: fix for uninitialized global variables. [Ruby 1.9 - Bug #4811]
--
* ext/tk/extconf.rb: use $defs not $CPPFLAGS to get rid of
command line escape issues on Windows. fixed #4835.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32386 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r-- | version.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 285 +#define RUBY_PATCHLEVEL 286 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |