summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-31 02:28:46 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-31 02:28:46 +0000
commit72b489a5ad8033dd1c70784bb40e7419e1380a31 (patch)
tree2c3e962fbedc5464b024b22d8193518c2fea5845 /ChangeLog
parenta4dba495753dd30492721cee621c75655ba3ff73 (diff)
merges r30798 from trunk into ruby_1_9_2.
-- * lib/test/unit/assertions.rb (assert_block): move from test/fileutils/fileasserts.rb. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31851 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 03cfc01b87..8e911ab5fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -472,7 +472,10 @@ Sun May 1 18:35:34 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* test/fileutils/fileasserts.rb (assert_block): little workaround
for [ruby-dev:43174].
-Sat Feb 5 20:40:34 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Feb 5 21:22:21 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/test/unit/assertions.rb (assert_block): move from
+ test/fileutils/fileasserts.rb.
* test/fileutils/fileasserts.rb (assert_block): pass arguments
as-is. [ruby-dev:43174]