summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-17 06:13:03 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-17 06:13:03 +0000
commit174b4fb8a43212958c4da9be33950ebd3480e332 (patch)
tree2705df52764c0b968c788450a6640caf437de78f /version.h
parentf1851a0233eb4f6921649b9abedb63e34db4fb69 (diff)
merges r24984 and r24987 from trunk into ruby_1_9_1.
-- * lib/mkmf.rb (rm_f, rm_rf): FileUtils.rm can take an array. [ruby-dev:39345] -- * test/fileutils/test_fileutils.rb: add a test for [ruby-dev:39345] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25809 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 9de05ab048..c5beb6446d 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 334
+#define RUBY_PATCHLEVEL 336
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1