diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-02-27 11:51:55 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-02-27 11:51:55 +0000 |
| commit | 9369118f8f4ed02c76839c6a67c268a2de9acde9 (patch) | |
| tree | 1c5e7235b590e1431f70ab743b4ac7314c7a0d81 /lib | |
| parent | b7111d382c16ee89dae3c19c756ce2272190d55a (diff) | |
Merge changes between r11871 and r11907 from ruby_1_8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@11908 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base64.rb | 2 | ||||
| -rw-r--r-- | lib/test/unit/autorunner.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/base64.rb b/lib/base64.rb index 410d76ffcd..05be9ddf78 100644 --- a/lib/base64.rb +++ b/lib/base64.rb @@ -102,7 +102,7 @@ module Base64 # # require 'base64' # data = "Now is the time for all good coders\nto learn Ruby" - # puts Base64.b64encode(data) + # Base64.b64encode(data) # # <i>Generates:</i> # diff --git a/lib/test/unit/autorunner.rb b/lib/test/unit/autorunner.rb index dadf080d12..86c9b12940 100644 --- a/lib/test/unit/autorunner.rb +++ b/lib/test/unit/autorunner.rb @@ -81,6 +81,7 @@ module Test @filters = [] @to_run = [] @output_level = UI::NORMAL + @workdir = nil yield(self) if(block_given?) end |