diff options
| author | Michael Wallner <mike@php.net> | 2013-10-21 22:15:55 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2013-10-21 22:15:55 +0200 |
| commit | 757f4a952ce77b7892b38e177fa78de8e2f54128 (patch) | |
| tree | f4d8d1fb491031de9a27636da103c3a8f9acd57a /ext/zip/lib/zip_source_zip.c | |
| parent | b636c03426193ecf0b7e166126a14b70ce8185e9 (diff) | |
| parent | 2fa5f39e4c489495b886214aa788d0fbffe06446 (diff) | |
| download | php-git-757f4a952ce77b7892b38e177fa78de8e2f54128.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
add tests for bug #62523
Merged PR #293 (Exif crash on unknown encoding was fixed) By: Draal Conflicts: configure.in main/php_version.h
Diffstat (limited to 'ext/zip/lib/zip_source_zip.c')
0 files changed, 0 insertions, 0 deletions