diff options
| author | Remi Collet <remi@php.net> | 2013-10-29 09:02:44 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2013-10-29 09:02:44 +0100 |
| commit | a7fc8eecb0a23a21666ddab2eb09a54a3e9690f5 (patch) | |
| tree | 31841d0e7297a9626cd6452790942a9ff7f6fb8e /ext/zip/lib/zip_get_encryption_implementation.c | |
| parent | ad7793d94cdc852db2515ce30d8d97a9a0f3f0ab (diff) | |
| parent | e2c9f3983ac81478e73fa86b8d218795aa9ee201 (diff) | |
| download | php-git-a7fc8eecb0a23a21666ddab2eb09a54a3e9690f5.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
add bundled libzip LICENSE, as required by BSD License terms
Diffstat (limited to 'ext/zip/lib/zip_get_encryption_implementation.c')
0 files changed, 0 insertions, 0 deletions