diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-17 06:13:03 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-17 06:13:03 +0000 |
commit | 7d112971e27eef2ff306d0337943665694d36fc3 (patch) | |
tree | 2705df52764c0b968c788450a6640caf437de78f /version.h | |
parent | 8ba0c5b9ee68bcee1384162e568850f43ae11979 (diff) | |
download | ruby-7d112971e27eef2ff306d0337943665694d36fc3.tar.gz ruby-7d112971e27eef2ff306d0337943665694d36fc3.tar.xz ruby-7d112971e27eef2ff306d0337943665694d36fc3.zip |
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
Diffstat (limited to 'version.h')
-rw-r--r-- | version.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |