diff options
| author | Scott MacVicar <scottmac@php.net> | 2014-02-16 22:51:20 -0800 |
|---|---|---|
| committer | Scott MacVicar <scottmac@php.net> | 2014-02-16 22:51:20 -0800 |
| commit | 24092b7196653b780abf7e420423836df8592751 (patch) | |
| tree | 279353515003b0a70a4c50e795560821f032ee93 /ext/json/php_json.h | |
| parent | d06551b957492f589796ff3de1eb1afa57afe087 (diff) | |
| parent | 796bfb0bd000f7d9d23e633a965f6a8a77a5e927 (diff) | |
| download | php-git-24092b7196653b780abf7e420423836df8592751.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
imagettftext() uses the last charactermap it found and not the one you want
[libxml] Unit test for libxml_disable_entity_loader()
Add pgsql related change information to NEWS and UPGRADING
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions