diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-30 12:51:59 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-30 12:51:59 +0000 |
commit | e2a553e4734b17be9378b8120ad3bb7f818789c5 (patch) | |
tree | de9c37e6aecec290d63666964cc5da9848e4c738 /version.h | |
parent | 495670d273617cc0874ca53d748bff5f3849d1e4 (diff) |
merges r25435 from trunk into ruby_1_9_1.
--
* test/ruby/envutil.rb (assert_in_out_err): test_stdout and
test_stderr should be an array.
* test/ruby/test_rubyoptions.rb (test_notfound): test_stdin of
assert_in_out_err should be a string.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26500 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 405 +#define RUBY_PATCHLEVEL 406 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |