aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--ext/nkf/nkf-utf8/nkf.c6
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 4412e13cc0..c879896ebc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 8 21:03:22 2011 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/nkf/nkf-utf8/nkf.c: import nkf 2.1.2 (be9c280)
+ Bump version number/release date only.
+
Thu Sep 8 12:43:18 2011 Narihiro Nakamura <authornari@gmail.com>
* gc.c (Init_GC): defined GC::Profiler.raw_data. based on the
@@ -66,7 +71,7 @@ Tue Sep 6 21:13:47 2011 Masaya Tarui <tarui@ruby-lang.org>
* win32/Makefile.sub (INSNS): change command line option -Ks to -Ku
for generate *.inc. because insns.def encoding has been changed SJIS
- to UTF-8. if $BASERUBY is 1.9, -Ks cause an error. [Feature #5128]
+ to UTF-8. if $BASERUBY is 1.9, -Ks cause an error. [Feature #5128]
(same as r33194)
Tue Sep 6 15:55:24 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c
index fc5b30d921..0382f30938 100644
--- a/ext/nkf/nkf-utf8/nkf.c
+++ b/ext/nkf/nkf-utf8/nkf.c
@@ -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"