summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-31 07:02:52 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-31 07:02:52 +0000
commitc9de2578664b0170c41eb61fff526be7120969ed (patch)
tree9d35ba2972fdf91d270f7db08fd63f764b5b3688 /version.h
parentcc6407f8fe4447fa573dd381e7fb66926b9b16c3 (diff)
merge revision(s) 33142:
* ext/json: Merge json gem v1.5.4 (3dab4c5a6a97fac03dac). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33143 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
0 files changed, 0 insertions, 0 deletions