diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-28 14:15:54 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-28 14:15:54 +0000 |
commit | 67b79d6c84b1611cb15a05cafc93ed8b875e2e06 (patch) | |
tree | cb06db0570933f410b0ca69130e9f9fdfe6858e3 /version.h | |
parent | e966115c7d0b1a8725a3eb91ed1beaf1e93f2da2 (diff) |
merges r24616 from trunk into ruby_1_9_1.
--
* thread.c (rb_check_deadlock): decrease number of sleepers before
deadlock detection because the deadlock exception makes main thread
run. [ruby-dev:39142]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25541 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.1" -#define RUBY_PATCHLEVEL 300 +#define RUBY_PATCHLEVEL 301 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |