diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-21 10:36:18 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-21 10:36:18 +0000 |
commit | 0889e6347259f725517ddfc667e4b6f4e6d94b1b (patch) | |
tree | c5834587a0178179114ede1300bdf862eb7ada22 | |
parent | 29bf9de0a4971afa6f21c1065e7e8c258f38b33d (diff) |
merges r23745 from trunk into ruby_1_9_1.
--
* encoding.c (rb_enc_name_list): update RDoc. [ruby-core:23926]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23805 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | encoding.c | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 5 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Fri Jun 19 20:53:54 2009 Yukihiro Matsumoto <matz@ruby-lang.org> + + * encoding.c (rb_enc_name_list): update RDoc. [ruby-core:23926] + Fri Jun 19 20:44:45 2009 Tadayoshi Funaba <tadf@dotrb.org> * complex.c: constant COMPLEX_NAME has been removed. diff --git a/encoding.c b/encoding.c index 4afee36ff3..bde6b5d929 100644 --- a/encoding.c +++ b/encoding.c @@ -1301,8 +1301,6 @@ rb_enc_name_list_i(st_data_t name, st_data_t idx, st_data_t arg) * "Windows-31J", * "BINARY", "CP932", "eucJP"] * - * This list doesn't include dummy encodings. - * */ static VALUE @@ -1,6 +1,6 @@ #define RUBY_VERSION "1.9.1" #define RUBY_RELEASE_DATE "2009-05-22" -#define RUBY_PATCHLEVEL 195 +#define RUBY_PATCHLEVEL 196 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |