diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-23 12:45:38 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-23 12:45:38 +0000 |
commit | 5ef68cb63fce03898464be3373d66d38d2b07f89 (patch) | |
tree | fa3f563b3a27c885d1e6ee2b44e14d8687c41021 /version.h | |
parent | d80452a1839d89e8f1ef80fefba5d7b48fc9df16 (diff) |
merges r30169 and r30170 from trunk into ruby_1_9_2.
--
* ext/tk/lib/multi-tk.rb: infinite loop on method_missing at loading.
[ruby-dev:42716] [Ruby 1.9-Bug#4129]
* ext/tk/lib/multi-tk.rb: when no eventloop is running, ruby freezes at exit.
--
add an entry.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30319 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 124 +#define RUBY_PATCHLEVEL 125 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |