diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-13 08:08:02 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-13 08:08:02 +0000 |
| commit | 39c9f447f8afdb19fc9f99ba571a17d7f99398c1 (patch) | |
| tree | f90d544a7271715926cb298c1e3d1c9c6f2903fa /ChangeLog | |
| parent | 2d6fb10a9cb105de9976f081949e9df96274d230 (diff) | |
merges r24015 from trunk into ruby_1_9_1.
--
* marshal.c (r_object0): set encoding only if the encoding is not US-ASCII.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24079 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Fri Jul 10 14:41:34 2009 NARUSE, Yui <naruse@ruby-lang.org> + + * marshal.c (r_object0): set encoding only if the encoding + is not US-ASCII. + Fri Jul 10 11:41:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * include/ruby/ruby.h (rb_obj_{untrust,untrusted,trust}): added |