summaryrefslogtreecommitdiff
path: root/ext/json/php_json_parser.h
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2015-01-22 10:17:45 +0100
committerAnatol Belski <ab@php.net>2015-01-22 10:17:45 +0100
commitf9d672f7d4c9d2fdae3c871fd91e49f717cfa4c2 (patch)
tree7f9f83385eff0d7fa5d056e62e636fde918032c2 /ext/json/php_json_parser.h
parentb2c39c1d2930d7c68cc090193ea8765201d61f0c (diff)
parent60c2621b2a9a82f0a31988aa58a3be9192184bdf (diff)
downloadphp-git-f9d672f7d4c9d2fdae3c871fd91e49f717cfa4c2.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: simplify error handling for dirs as magic
Diffstat (limited to 'ext/json/php_json_parser.h')
0 files changed, 0 insertions, 0 deletions