summaryrefslogtreecommitdiff
path: root/main/php.h
diff options
context:
space:
mode:
authorMatteo Beccati <mbeccati@php.net>2014-09-03 09:45:17 +0200
committerMatteo Beccati <mbeccati@php.net>2014-09-03 09:45:17 +0200
commitd1b0066df756396ade428569debe3816fc196683 (patch)
tree32e645e6f19c5411003cb015177ce561c0ce840e /main/php.h
parentb0f0211b1ae695809f72a8a241649cda6ecd38bb (diff)
parent627704b38e0c4ded81fb90524171546d77e2500e (diff)
downloadphp-git-d1b0066df756396ade428569debe3816fc196683.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: Fixed test with freetype >= 2.4.12
Diffstat (limited to 'main/php.h')
0 files changed, 0 insertions, 0 deletions