summaryrefslogtreecommitdiff
path: root/sapi/phpdbg/phpdbg_prompt.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2016-03-02 15:09:50 +0300
committerDmitry Stogov <dmitry@zend.com>2016-03-02 15:09:50 +0300
commit701edb8c82439ed5986be0718a5246cd37452f96 (patch)
treebc03cf2a50faec308c33c2b7db6445abb66e5bd7 /sapi/phpdbg/phpdbg_prompt.c
parent95eda16fe97aa6c3647f8624fe2345f3c571f0c2 (diff)
parentb6bbe33f0555a9f5a2085b1716659a94232fe0da (diff)
downloadphp-git-701edb8c82439ed5986be0718a5246cd37452f96.tar.gz
Merge branch 'PHP-7.0'
* PHP-7.0: Better fix for IS_INDIRECT support in zend_hash_merge()
Diffstat (limited to 'sapi/phpdbg/phpdbg_prompt.c')
0 files changed, 0 insertions, 0 deletions