]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad0b63c 00525b8)
Merge branch 'PHP-5.4' into PHP-5.5
authorMatteo Beccati <mbeccati@php.net>
Tue, 16 Sep 2014 08:22:34 +0000 (10:22 +0200)
committerMatteo Beccati <mbeccati@php.net>
Tue, 16 Sep 2014 08:22:34 +0000 (10:22 +0200)
* PHP-5.4:
  Fixed freetype test on multiple environments


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