diff options
| author | Matteo Beccati <mbeccati@php.net> | 2014-09-03 09:45:09 +0200 |
|---|---|---|
| committer | Matteo Beccati <mbeccati@php.net> | 2014-09-03 09:45:09 +0200 |
| commit | 627704b38e0c4ded81fb90524171546d77e2500e (patch) | |
| tree | ae1f13a00c457c23aab72c9591f2cf82d868a927 /main/php.h | |
| parent | 3e7d11b632f80527e6b587290f706d2abdb4839c (diff) | |
| parent | 72c9b0e12b55433b892b82ff74aeba90840c8cb0 (diff) | |
| download | php-git-627704b38e0c4ded81fb90524171546d77e2500e.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed test with freetype >= 2.4.12
Diffstat (limited to 'main/php.h')
0 files changed, 0 insertions, 0 deletions