summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-13 05:19:12 (GMT)
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-13 05:19:12 (GMT)
commitf5219fee6307461c7ead4358290958679d9d0d38 (patch)
treef54cbc4f820ffb7394b1e631ffd78465a0743321 /ChangeLog
parent4607f95f7380f3eeef16230a7d55e07dc4c9f6cc (diff)
* ext/json: merge upstream from flori/json
change usage of TypedData. [Feature #10739][ruby-core:67564] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49582 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 134c2b1..e93cc12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 13 14:19:06 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+
+ * ext/json: merge upstream from flori/json
+ change usage of TypedData. [Feature #10739][ruby-core:67564]
+
Thu Feb 12 18:34:01 2015 multisnow <infinity.blick.winkel@gmail.com>
* ext/openssl/extconf.rb: check RAND_edg to support libressl.