summaryrefslogtreecommitdiff
path: root/ext/json/json.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2014-01-26 12:17:32 -0800
committerStanislav Malyshev <stas@php.net>2014-01-26 12:17:32 -0800
commit8e08f6c28d04eba86e237719d132366606fae3c4 (patch)
tree7c7c77e6c623a30ef4fdbd374a8657f155fa72f8 /ext/json/json.c
parentc4259f90b18746a5014ef2d021154a35c03b299c (diff)
parentd78c40d25dccba9911930ac5e89843f0082ea3b4 (diff)
downloadphp-git-8e08f6c28d04eba86e237719d132366606fae3c4.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: fix test - new flag ZEND_ACC_HAS_TYPE_HINTS
Diffstat (limited to 'ext/json/json.c')
0 files changed, 0 insertions, 0 deletions