From 350d4bcd0b8dff0995fe4e340c83b2bc72b8e723 Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 9 Nov 2012 07:16:02 +0000 Subject: merge revision(s) 36332: * test/csv/test_features.rb: add require for Tempfile. * test/csv/test_serialization.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37586 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ test/csv/test_features.rb | 1 + test/csv/test_serialization.rb | 1 + version.h | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 968f6a8f6f..ac7f9785cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Nov 9 16:15:50 2012 CHIKANAGA Tomoyuki + + * test/csv/test_features.rb: add require for Tempfile. + * test/csv/test_serialization.rb: ditto. + Fri Nov 9 13:47:45 2012 Luis Lavena * test/win32ole/test_win32ole.rb (test_s_codepage_changed): diff --git a/test/csv/test_features.rb b/test/csv/test_features.rb index 33166e8d77..8610949a35 100755 --- a/test/csv/test_features.rb +++ b/test/csv/test_features.rb @@ -10,6 +10,7 @@ require "zlib" require_relative "base" +require "tempfile" class TestCSV::Features < TestCSV extend DifferentOFS diff --git a/test/csv/test_serialization.rb b/test/csv/test_serialization.rb index 09440a426b..dafe12bb38 100755 --- a/test/csv/test_serialization.rb +++ b/test/csv/test_serialization.rb @@ -8,6 +8,7 @@ # under the terms of Ruby's license. require_relative "base" +require "tempfile" # An example of how to provide custom CSV serialization. class Hash diff --git a/version.h b/version.h index bc5126f4fa..7d3ec5edd9 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 323 +#define RUBY_PATCHLEVEL 324 #define RUBY_RELEASE_DATE "2012-11-09" #define RUBY_RELEASE_YEAR 2012 -- cgit v1.2.3