diff options
| author | Matteo Beccati <mbeccati@php.net> | 2014-09-03 09:44:59 +0200 |
|---|---|---|
| committer | Matteo Beccati <mbeccati@php.net> | 2014-09-03 09:44:59 +0200 |
| commit | 72c9b0e12b55433b892b82ff74aeba90840c8cb0 (patch) | |
| tree | e3c0084a7a47372059f0af1d495ef8715a7a9ed3 /sapi/phpdbg/phpdbg_parser.c | |
| parent | a734acd4398abcbf6130b3d091bcb8a6ce7ec70d (diff) | |
| parent | 592df890276604c790d02be26b1b3c3710b3b888 (diff) | |
| download | php-git-72c9b0e12b55433b892b82ff74aeba90840c8cb0.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed test with freetype >= 2.4.12
Diffstat (limited to 'sapi/phpdbg/phpdbg_parser.c')
0 files changed, 0 insertions, 0 deletions