diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-08-04 16:13:43 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-08-04 16:13:43 -0700 |
| commit | f2f8ea9ac53973a1ddb55ddc5eae3109d841309c (patch) | |
| tree | 8fd13ecb77212cabcd78cfd17dc3fe89a1592661 /ext/zip/php_zip.c | |
| parent | d52c4857178cf30741905469c5a080bbdd973478 (diff) | |
| parent | f1acac154ac7684bc908fc2ad8962372c9d4e312 (diff) | |
| download | php-git-f2f8ea9ac53973a1ddb55ddc5eae3109d841309c.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
__wakeup doesn't have to be final
Diffstat (limited to 'ext/zip/php_zip.c')
0 files changed, 0 insertions, 0 deletions