summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-25 04:24:37 +0000
committerryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-25 04:24:37 +0000
commit4a722bd73aabe679943ababa549ea44a0275c64d (patch)
tree3bbfca52985ea271aa967011475eec2d85afaf50
parent0c232beb9c109e3f35c5c9604312e959b5ddb7a4 (diff)
Dunno why this conflicted
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30345 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 32aef99..b7dfc44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -242,6 +242,10 @@ Thu Dec 16 08:04:47 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* iseq.c (set_relation), vm_insnhelper.c (vm_cref_push): nd_file
is always zero-cleared.
+Thu Dec 16 07:22:30 2010 Ryan Davis <ryand-ruby@zenspider.com>
+
+ * lib/minitest/unit.rb: Imported minitest 2.0.1 r6079.
+
Wed Dec 15 20:45:02 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/test/unit.rb (process_args): need to setup @help to print options.