summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-13 03:10:19 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-13 03:10:19 +0000
commit465eec7158652dea2823f919eb3f4b0ed01e9ff3 (patch)
treecf55ab94919493eb7f14ecccdb6ee4b6df07fe59
parent5ecf4d8af325771bb022e922a38b15e7e4dfb94a (diff)
merge revision(s) 15425:
* lib/benchmark.rb (Job::Benchmark#item): fix typo. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17135 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/benchmark.rb2
-rw-r--r--version.h2
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e644315..cef2c66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jun 13 12:10:13 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/benchmark.rb (Job::Benchmark#item): fix typo.
+
Fri Jun 13 12:06:17 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/bigdecimal/bigdecimal.c (BigDecimal_to_f): use strtod() for more
diff --git a/lib/benchmark.rb b/lib/benchmark.rb
index bd91a6e..6ab0755 100644
--- a/lib/benchmark.rb
+++ b/lib/benchmark.rb
@@ -333,7 +333,7 @@ module Benchmark
# 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
diff --git a/version.h b/version.h
index aad08f6..bd2827b 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2008-06-13"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20080613
-#define RUBY_PATCHLEVEL 173
+#define RUBY_PATCHLEVEL 174
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8