diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-14 15:25:34 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-14 15:25:34 +0000 |
| commit | 7139427cf313dfc647dd1e6c5a6d1e3829e13280 (patch) | |
| tree | ebb56f1840e8a297d15693b56f26cf6bf45bcbc3 /version.h | |
| parent | 4d238acd886ac75c3040495492b3dc77c2edbf9f (diff) | |
merge revision(s) r46391,r46395: [Backport #9766]
* lib/csv.rb (CSV#<<): honor explicity given encoding. based on
the patch by DAISUKE TANIWAKI <daisuketaniwaki AT gmail.com> at
[ruby-core:62113]. [Bug #9766]
* lib/csv.rb (CSV#<<): honor explicitly given encoding. based on
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47586 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
| -rw-r--r-- | version.h | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,10 +1,10 @@ #define RUBY_VERSION "2.1.2" -#define RUBY_RELEASE_DATE "2014-09-10" -#define RUBY_PATCHLEVEL 235 +#define RUBY_RELEASE_DATE "2014-09-15" +#define RUBY_PATCHLEVEL 236 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 9 -#define RUBY_RELEASE_DAY 10 +#define RUBY_RELEASE_DAY 15 #include "ruby/version.h" |