summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-13 03:09:44 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-13 03:09:44 +0000
commit32ddfd300d0e2720f1c77e152dae9157d46812be (patch)
treed760325ce69d38773c80640ac58ffcf9c21b869d
parentae0134eeadfa885245668af5f61597922b83df3f (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_5@17133 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 28928a1c383..51c73cc0862 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jun 13 12:09:02 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/benchmark.rb (Job::Benchmark#item): fix typo.
+
Fri Jun 13 12:03:31 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 0120caf1550..36cd4b55a9c 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 87c8eef2d92..193862b3ed7 100644
--- a/version.h
+++ b/version.h
@@ -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