shyouhei	2008-06-13 12:09:44 +0900 (Fri, 13 Jun 2008)

  New Revision: 17133

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/lib/benchmark.rb
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 15425:
    * lib/benchmark.rb (Job::Benchmark#item): fix typo.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/lib/benchmark.rb?r1=17133&r2=17132&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17133&r2=17132&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17133&r2=17132&diff_format=u

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 17132)
+++ ruby_1_8_5/ChangeLog	(revision 17133)
@@ -1,3 +1,7 @@
+Fri Jun 13 12:09:02 2008  NARUSE, Yui  <naruse@r...>
+
+	* lib/benchmark.rb (Job::Benchmark#item): fix typo.
+
 Fri Jun 13 12:03:31 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/bigdecimal/bigdecimal.c (BigDecimal_to_f): use strtod() for more
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 17132)
+++ ruby_1_8_5/version.h	(revision 17133)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-13"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080613
-#define RUBY_PATCHLEVEL 172
+#define RUBY_PATCHLEVEL 173
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_5/lib/benchmark.rb
===================================================================
--- ruby_1_8_5/lib/benchmark.rb	(revision 17132)
+++ ruby_1_8_5/lib/benchmark.rb	(revision 17133)
@@ -333,7 +333,7 @@
     # Registers the given label and block pair in the job list.
     #
     def item(label = "", &blk) # :yield:
-      raise ArgmentError, "no block" unless block_given?
+      raise ArgumentError, "no block" unless block_given?
       label.concat ' '
       w = label.length
       @width = w if @width < w

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/