]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3e7d11b 72c9b0e)
Merge branch 'PHP-5.5' into PHP-5.6
authorMatteo Beccati <mbeccati@php.net>
Wed, 3 Sep 2014 07:45:09 +0000 (09:45 +0200)
committerMatteo Beccati <mbeccati@php.net>
Wed, 3 Sep 2014 07:45:09 +0000 (09:45 +0200)
* PHP-5.5:
  Fixed test with freetype >= 2.4.12


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.