diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-09-08 12:18:41 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-09-08 12:18:41 +0000 |
commit | 60ce4b55fbfed782e09f0a959c5efff95054593a (patch) | |
tree | 52929e205c6d6ee894a9d747733e4cd92c60508c | |
parent | 69cc900f523dff669a788d57e9599cb43263a9f5 (diff) |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33226 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/nkf/nkf-utf8/nkf.c | 6 | ||||
-rw-r--r-- | version.h | 4 |
3 files changed, 10 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Thu Sep 8 21:17:36 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. + Wed Sep 7 23:42:45 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> * io.c (argf_next_argv): open in default text mode. 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" @@ -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" |