summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-09-08 12:18:41 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-09-08 12:18:41 +0000
commit60ce4b55fbfed782e09f0a959c5efff95054593a (patch)
tree52929e205c6d6ee894a9d747733e4cd92c60508c /ChangeLog
parent69cc900f523dff669a788d57e9599cb43263a9f5 (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
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 88c9745782..3c7571d8ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.