aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-12 10:51:49 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-12 10:51:49 +0000
commit43f6fdfb42d3f4c9025c290bdf5aeffe5959f1bf (patch)
treebc2260bf09b94eef5c9ce2b08f366a822a9a2fed /ChangeLog
parent395d7bb34624d69bf54e121a4f385ef84537e996 (diff)
downloadruby-43f6fdfb42d3f4c9025c290bdf5aeffe5959f1bf.tar.gz
* ext/json: merge JSON 1.7.5.
fix tests and other fixes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38346 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 51af4f651e..87e2037c00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 12 19:48:59 2012 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/json: merge JSON 1.7.5.
+ fix tests and other fixes.
+
Wed Dec 12 18:30:29 2012 Shugo Maeda <shugo@ruby-lang.org>
* class.c (rb_prepend_module): move refined methods from the origin