aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-30 18:41:46 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-30 18:41:46 +0000
commit07d1ba775711ee597b4a5b3da93606b7ed6830ff (patch)
treeb22d20aab36d664a7742343271a9bcfc9c6b2053 /ChangeLog
parent028f3801f806a6aebe7d8d1fb78d0ba3e38d6036 (diff)
downloadruby-07d1ba775711ee597b4a5b3da93606b7ed6830ff.tar.gz
* ext/nkf/nkf-utf8/nkf.c: Merge upstream 69f7e74dde.
fix indent. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54440 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 5481030c82..b4ac4701eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar 31 03:41:02 2016 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/nkf/nkf-utf8/nkf.c: Merge upstream 69f7e74dde.
+ fix indent.
+
Wed Mar 30 16:33:19 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* extension.rdoc, extension.ja.rdoc: [DOC] Fix some errors.