From fba7863392bdf1c968f574de129c14ae30784f88 Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 5 Dec 2009 02:36:11 +0000 Subject: merges r25353 and r25362 from trunk into ruby_1_9_1. -- * lib/csv.rb (CSV#read_to_char): set encoding and verify data which read from io before encode it to @encoding. * lib/csv.rb (CSV#raw_encoding): add to get @io's encoding. * lib/csv.rb (CSV#read_io): add to read string and set @io's encoding. -- * lib/csv.rb (CSV#raw_encoding): returns ASCII-8BIT when the io doesn't have encoding. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25999 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- version.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'version.h') diff --git a/version.h b/version.h index 84d46cfbda..34f5057929 100644 --- a/version.h +++ b/version.h @@ -1,13 +1,13 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 355 +#define RUBY_PATCHLEVEL 356 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2009 -#define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 27 -#define RUBY_RELEASE_DATE "2009-11-27" +#define RUBY_RELEASE_MONTH 12 +#define RUBY_RELEASE_DAY 5 +#define RUBY_RELEASE_DATE "2009-12-05" #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit v1.2.3