summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-01-16 06:30:33 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-01-16 06:30:33 +0000
commit66fd410332f4a2aa009a7b6544b5637fad84842c (patch)
treed2d90abdb8e9e21f1e079d57972cb65c8dcc04a1 /version.h
parent27f15990add9196eb04e3a6b4da951e7e4280beb (diff)
merges r30407 and r30450 from trunk into ruby_1_9_2.
-- * ext/fiddle/extconf.rb: check for windows.h while building fiddle. Thanks Jon Forums! [ruby-core:33923] -- * Use _WIN32 rather than checking for windows.h. Thanks Jon Forums! [ruby-core:33977] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30559 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 928327c28d..a2d9455a64 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 141
+#define RUBY_PATCHLEVEL 142
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1