summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 16:24:22 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 16:24:22 +0000
commitae2dd3bd11b1c3252fdccf30617b19b59029ede9 (patch)
tree06d79383cdbeee4addbb894f3c2c7f127cbb93de
parent91e3f371009f9da6f685fd4ca10f72eb1a46a12d (diff)
merge revision(s) 13687:
* lib/rexml/source.rb (REXML::SourceFactory::SourceFactory): typo fixed. [ruby-list:44099] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@16885 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/rexml/source.rb2
-rw-r--r--version.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index bcc0744c7e..069cef8dcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 8 01:23:29 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/rexml/source.rb (REXML::SourceFactory::SourceFactory): typo
+ fixed. [ruby-list:44099]
+
Sun Jun 8 01:17:45 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* {bcc32,win32}/Makefile.sub (COMMON_MACROS): workaround for old SDK's
diff --git a/lib/rexml/source.rb b/lib/rexml/source.rb
index cacab221db..dfe6c19f07 100644
--- a/lib/rexml/source.rb
+++ b/lib/rexml/source.rb
@@ -17,7 +17,7 @@ module REXML
elsif arg.kind_of? Source
arg
else
- raise "#{source.class} is not a valid input stream. It must walk \n"+
+ raise "#{arg.class} is not a valid input stream. It must walk \n"+
"like either a String, IO, or Source."
end
end
diff --git a/version.h b/version.h
index 5896cd8e04..48c7a94824 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2008-06-08"
#define RUBY_VERSION_CODE 185
#define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 131
+#define RUBY_PATCHLEVEL 132
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8