naruse	2011-09-08 21:18:41 +0900 (Thu, 08 Sep 2011)

  New Revision: 33226

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

  Log:
    merge revision(s) 33225:
    
    * ext/nkf/nkf-utf8/nkf.c: import nkf 2.1.2 (be9c280)
      Bump version number/release date only.
      to UTF-8. if $BASERUBY is 1.9, -Ks cause an error. [Feature #5128]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/nkf/nkf-utf8/nkf.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 33225)
+++ ruby_1_9_3/ChangeLog	(revision 33226)
@@ -1,3 +1,8 @@
+Thu Sep  8 21:17:36 2011  NARUSE, Yui  <naruse@r...>
+
+	* ext/nkf/nkf-utf8/nkf.c: import nkf 2.1.2 (be9c280)
+	  Bump version number/release date only.
+
 Wed Sep  7 23:42:45 2011  Nobuyoshi Nakada  <nobu@r...>
 
 	* io.c (argf_next_argv): open in default text mode.
Index: ruby_1_9_3/ext/nkf/nkf-utf8/nkf.c
===================================================================
--- ruby_1_9_3/ext/nkf/nkf-utf8/nkf.c	(revision 33225)
+++ ruby_1_9_3/ext/nkf/nkf-utf8/nkf.c	(revision 33226)
@@ -20,11 +20,11 @@
  *
  * 3. This notice may not be removed or altered from any source distribution.
  */
-#define NKF_VERSION "2.1.1"
-#define NKF_RELEASE_DATE "2011-03-25"
+#define NKF_VERSION "2.1.2"
+#define NKF_RELEASE_DATE "2011-09-08"
 #define COPY_RIGHT \
     "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).\n" \
-    "Copyright (C) 1996-2010, The nkf Project."
+    "Copyright (C) 1996-2011, The nkf Project."
 
 #include "config.h"
 #include "nkf.h"
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 33225)
+++ ruby_1_9_3/version.h	(revision 33226)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
 #define RUBY_PATCHLEVEL -1
 
-#define RUBY_RELEASE_DATE "2011-09-07"
+#define RUBY_RELEASE_DATE "2011-09-08"
 #define RUBY_RELEASE_YEAR 2011
 #define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 7
+#define RUBY_RELEASE_DAY 8
 
 #include "ruby/version.h"
 

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