summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-07-03 10:17:20 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-07-03 10:17:20 +0000
commit1686286ef1655b7f97a054baae23f1955ce9f598 (patch)
tree5789c63a53cf12efceed16372694f638ab39fc9b
parent42c34dd375c368d8e08f5243571d6983c9d02e19 (diff)
merge revision(s) 36258:
* KNOWNBUGS.rb: Bug #2330 was fixed in r26718. [ruby-dev:40234] [ruby-core:27959] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--KNOWNBUGS.rb11
-rw-r--r--version.h2
2 files changed, 1 insertions, 12 deletions
diff --git a/KNOWNBUGS.rb b/KNOWNBUGS.rb
index 5c0e4d5156..b97a08d928 100644
--- a/KNOWNBUGS.rb
+++ b/KNOWNBUGS.rb
@@ -3,14 +3,3 @@
# So all tests will cause failure.
#
-assert_normal_exit %q{
- open("tst-remove-load.rb", "w") {|f|
- f << <<-'End'
- module Kernel
- remove_method :load
- end
- raise
- End
- }
- load "tst-remove-load.rb"
-}, '[ruby-dev:40234] [ruby-core:27959]', :timeout => 1
diff --git a/version.h b/version.h
index 058bea37e7..40aa6d4363 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 245
+#define RUBY_PATCHLEVEL 246
#define RUBY_RELEASE_DATE "2012-07-03"
#define RUBY_RELEASE_YEAR 2012