diff options
| author | Remi Collet <remi@php.net> | 2013-01-10 11:18:25 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2013-01-10 11:18:25 +0100 |
| commit | b3a934bdb317845c56247b55db4212ffc4171942 (patch) | |
| tree | ee63e175449bbf354c79434f61ccc2efa3779100 /ext/xmlreader/php_xmlreader.c | |
| parent | 846e506a3d1d11773171e08d3c6f9bbc7fc3dacd (diff) | |
| parent | f659ec108f2a3a8278300e6f110545e219f2a1b7 (diff) | |
| download | php-git-b3a934bdb317845c56247b55db4212ffc4171942.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle) See commit c05ee74e7ff28b49018bf3e8f452bfd5386d1b68
Diffstat (limited to 'ext/xmlreader/php_xmlreader.c')
0 files changed, 0 insertions, 0 deletions