summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-01-28 02:25:38 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-01-28 02:25:38 +0000
commit22955e9b4d5e853f8f7aaef23c8ccb9df34af2ec (patch)
treee9967398de4a8af8335fc8df041b93b91dab5dc2 /version.h
parentbe007d6eae988b657f639446ba6ff2bf0ddefa72 (diff)
merges r30647,r30650 and r30651 from trunk into ruby_1_9_2.
-- * test/ruby/test_thread.rb: Added various ConditionVariable tests. -- * test/ruby/test_thread.rb (TestThread#test_condvar_nolock_2): get rid of method redefined. -- * test/ruby/test_thread.rb: remove unused variables. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30693 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 1779949812..d7c3d7886d 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 170
+#define RUBY_PATCHLEVEL 171
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1