From 7d112971e27eef2ff306d0337943665694d36fc3 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 17 Nov 2009 06:13:03 +0000
Subject: 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25809 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'version.h')

diff --git a/version.h b/version.h
index 9de05ab04..c5beb6446 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
-- 
cgit