summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-28 16:26:34 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-28 16:26:34 +0000
commit1e1ac8268a5e488ec8bdd828104ff4fe17ca06d9 (patch)
treeeb37b1566b479b8f610b3d8ae8d82d2706b8e976 /ChangeLog
parentaf8c7c602b2f4cbf6642f6e1f05a8fc100adbb1a (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_2@54334 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 0dc9a5fb32..4e424201a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Mar 29 01:24:55 2016 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * enc/trans/JIS: update Unicode's notice. [Bug #11844]
+
Tue Mar 29 01:22:39 2016 Eric Hodel <drbrain@segment7.net>
* marshal.c (r_object0): raise ArgumentError when linking to undefined