summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-25 09:39:56 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-25 09:39:56 +0000
commitdf557d28ad2cd9bc38891e8f77c5ed45a0612681 (patch)
tree871244a69aa11140b37cc360f16a5ddf72c0f831 /ChangeLog
parent32299d987b69d02cdd3ca4a8c33c68233cfad4cd (diff)
merge revision(s) 54129,54130,54132: [Backport #11844]
* enc/trans/JIS: update Unicode's notice. [Bug #11844] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54283 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1392fb5ce0..1dfafa8ff8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Mar 25 18:38:42 2016 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * enc/trans/JIS: update Unicode's notice. [Bug #11844]
+
Fri Mar 25 18:36:04 2016 Eric Wong <e@80x24.org>
* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): document as MT-unsafe