diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-04-04 18:54:03 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-04-04 18:54:03 +0200 |
| commit | 69b2570b72a643f28135ebaf89ab1188d6cd7d45 (patch) | |
| tree | 8af49760bb791926beec56b167d7d7598cf21aa8 /main/SAPI.c | |
| parent | 7cccb6bc5a377bdd91321202e4970dfaf394c60b (diff) | |
| parent | 381edb425e16bd5d472c84d757465aa42cb39d0f (diff) | |
| download | php-git-69b2570b72a643f28135ebaf89ab1188d6cd7d45.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix bug #61480 test bug - ext/gd/tests/bug48555.phpt
updated the NEWS with the latest fileinfo changes
Conflicts:
NEWS
Diffstat (limited to 'main/SAPI.c')
0 files changed, 0 insertions, 0 deletions