summaryrefslogtreecommitdiffstats
path: root/version.h
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-28 14:15:39 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-28 14:15:39 +0000
commitaae1eff5f09ab24e5927428b3301f4c4ff993373 (patch)
tree48616fed93919322d97159db9103d0bc2848225f /version.h
parentb3ecdf9a0f4331bc86d49dafeb15313d8edc0d3c (diff)
merges r24591 from trunk into ruby_1_9_1.
-- * thread.c (rb_thread_terminate_all): do not ignore interrupt when reaping threads on termination. [ruby-dev:39107] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r--version.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/version.h b/version.h
index 6c86cf411..ceb66014e 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 298
+#define RUBY_PATCHLEVEL 299
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1