aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-28 22:29:11 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-28 22:29:11 +0000
commit4a481ad400a88e704d07c68aa8112c2a28bdf2c9 (patch)
treef0d67488a812a3c77be765c08484368bacf79e52 /ChangeLog
parent5547719573c6b37566480eaadf0c17bd0c5529bd (diff)
downloadruby-4a481ad400a88e704d07c68aa8112c2a28bdf2c9.tar.gz
* ext/json, test/json: merge JSON HEAD(17fe8e7)
https://github.com/flori/json/compare/v1.8.1...17fe8e7 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49051 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 557b981aad..f9019ec555 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 29 07:27:23 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+
+ * ext/json, test/json: merge JSON HEAD(17fe8e7)
+ https://github.com/flori/json/compare/v1.8.1...17fe8e7
+
Sun Dec 28 23:49:37 2014 Michal Papis <mpapis@gmail.com>
* rbinstall.rb: fix target location for installing bundled gems.