diff options
author | Rasmus Lerdorf <rasmus@lerdorf.com> | 2013-10-19 17:41:04 -0700 |
---|---|---|
committer | Rasmus Lerdorf <rasmus@lerdorf.com> | 2013-10-19 17:41:04 -0700 |
commit | 26b27767a6d3e2aa4d4fbb111d92cf01164bf230 (patch) | |
tree | e4c48b07432d0498928a370690ffee83ee0172d6 /ext/zip/php_zip.c | |
parent | d42fa2a0592a558d85b1dac498e9c5fd1413d49d (diff) | |
parent | 813e86765263aa91a3c5c4f72b2c40b7becb58a4 (diff) | |
download | php-git-26b27767a6d3e2aa4d4fbb111d92cf01164bf230.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Initialize these to make Coverity happy
Typo fix: managment -> management
Use minus sign instead of hyphen
Merge branch 'pull-request/499' Fix RFC 6598 IPv4 Reserved Range Checks
Diffstat (limited to 'ext/zip/php_zip.c')
0 files changed, 0 insertions, 0 deletions