yugui	2009-06-21 19:36:18 +0900 (Sun, 21 Jun 2009)

  New Revision: 23805

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23805

  Log:
    merges r23745 from trunk into ruby_1_9_1.
    --
    * encoding.c (rb_enc_name_list): update RDoc.  [ruby-core:23926]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/encoding.c
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/encoding.c
===================================================================
--- ruby_1_9_1/encoding.c	(revision 23804)
+++ ruby_1_9_1/encoding.c	(revision 23805)
@@ -1301,8 +1301,6 @@
  *       "Windows-31J",
  *       "BINARY", "CP932", "eucJP"]
  *
- * This list doesn't include dummy encodings.
- *
  */
 
 static VALUE
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 23804)
+++ ruby_1_9_1/ChangeLog	(revision 23805)
@@ -1,3 +1,7 @@
+Fri Jun 19 20:53:54 2009  Yukihiro Matsumoto  <matz@r...>
+
+	* encoding.c (rb_enc_name_list): update RDoc.  [ruby-core:23926]
+
 Fri Jun 19 20:44:45 2009  Tadayoshi Funaba  <tadf@d...>
 
 	* complex.c: constant COMPLEX_NAME has been removed.
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 23804)
+++ ruby_1_9_1/version.h	(revision 23805)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/