]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d06551b 796bfb0)
Merge branch 'PHP-5.6'
authorScott MacVicar <scottmac@php.net>
Mon, 17 Feb 2014 06:51:20 +0000 (22:51 -0800)
committerScott MacVicar <scottmac@php.net>
Mon, 17 Feb 2014 06:51:20 +0000 (22:51 -0800)
commit24092b7196653b780abf7e420423836df8592751
tree279353515003b0a70a4c50e795560821f032ee93tree | snapshot
parentd06551b957492f589796ff3de1eb1afa57afe087commit | diff
parent796bfb0bd000f7d9d23e633a965f6a8a77a5e927commit | diff
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
ext/gd/libgd/gdft.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.