diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2013-01-08 15:13:40 +0100 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2013-01-08 15:13:40 +0100 |
| commit | 10a2c0d574be62be1f0224d23909e27e74c87445 (patch) | |
| tree | f82712d29314dbc2805d91bca28d6b3852775eca /ext/zip/php_zip.c | |
| parent | f4142a92b2ecfa0fdf89ec83bb41c2a46b299973 (diff) | |
| parent | 2fb7cd30c59345838588ba89ad8b05cc4c34d6dd (diff) | |
| download | php-git-10a2c0d574be62be1f0224d23909e27e74c87445.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- fix bug #47358, glob returns error, should be empty array()
- NEWS entry for #50524
Diffstat (limited to 'ext/zip/php_zip.c')
0 files changed, 0 insertions, 0 deletions