diff options
| author | Adam Harvey <aharvey@php.net> | 2013-10-23 12:39:16 -0700 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2013-10-23 12:39:16 -0700 |
| commit | 96b6d4be49a201072961ee8f062ee11540d42b60 (patch) | |
| tree | 5997d5392be06eb46a643420c53c2ec142215a3a /ext/zip/lib/zip_source_zip.c | |
| parent | 5241cf7000041517d16cd52945d21d55de061a0f (diff) | |
| parent | 70c3a722e2561cb33d408f3c65e58f9468d2f667 (diff) | |
| download | php-git-96b6d4be49a201072961ee8f062ee11540d42b60.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
Increment version number, since this will be 5.5.6.
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'ext/zip/lib/zip_source_zip.c')
0 files changed, 0 insertions, 0 deletions