diff options
| author | Anatol Belski <ab@php.net> | 2015-02-12 20:29:24 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-02-12 20:29:24 +0100 |
| commit | d05070c98df7460e1b3d5f182f7ba99298454f58 (patch) | |
| tree | d5c88f99bcc10877adb54cb18c608cac44ed1330 /sapi/phpdbg/phpdbg_lexer.c | |
| parent | 3ae88e023c1429e42889510388b9980a555de89e (diff) | |
| parent | b5aca81de1862d539aded663c68e91f4098b3cde (diff) | |
| download | php-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 'sapi/phpdbg/phpdbg_lexer.c')
0 files changed, 0 insertions, 0 deletions