summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-08-09 00:33:04 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-08-09 00:33:04 +0000
commitd8a84ddbf3715ae64a38bfd4bc547e33f9e13d58 (patch)
treea9b694002bb9ccb5d760a5c6532c75211bdc5055
parenteb369d430adda4b5e2835165270592042343a9f9 (diff)
merge revision(s) 42453:
suppress warning introduced by r42439 [ruby-dev:47040] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@42454 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/coverage/test_coverage.rb2
-rw-r--r--version.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/test/coverage/test_coverage.rb b/test/coverage/test_coverage.rb
index d9770c029b..f4f192a578 100644
--- a/test/coverage/test_coverage.rb
+++ b/test/coverage/test_coverage.rb
@@ -47,7 +47,7 @@ class TestCoverage < Test::Unit::TestCase
Dir.mktmpdir {|tmp|
Dir.chdir(tmp) {
File.open("test.rb", "w") do |f|
- f.puts "1\n" * 10000
+ f.puts "__id__\n" * 10000
f.puts "def ignore(x); end"
f.puts "ignore([1"
f.puts "])"
diff --git a/version.h b/version.h
index 346ff894f5..387b604d93 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 459
+#define RUBY_PATCHLEVEL 460
-#define RUBY_RELEASE_DATE "2013-08-08"
+#define RUBY_RELEASE_DATE "2013-08-09"
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 8
+#define RUBY_RELEASE_DAY 9
#include "ruby/version.h"