summaryrefslogtreecommitdiff
path: root/ext/dom/php_dom.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2015-02-12 20:29:24 +0100
committerAnatol Belski <ab@php.net>2015-02-12 20:29:24 +0100
commitd05070c98df7460e1b3d5f182f7ba99298454f58 (patch)
treed5c88f99bcc10877adb54cb18c608cac44ed1330 /ext/dom/php_dom.c
parent3ae88e023c1429e42889510388b9980a555de89e (diff)
parentb5aca81de1862d539aded663c68e91f4098b3cde (diff)
downloadphp-git-d05070c98df7460e1b3d5f182f7ba99298454f58.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: backport gd config.w32 to support freetype 2.5
Diffstat (limited to 'ext/dom/php_dom.c')
0 files changed, 0 insertions, 0 deletions