com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend_A PI.h ext/spl/spl_fixedarray.c
| From: | Nikita Popov | Date: | Wed, 30 Jan 2013 19:34:01 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend_A PI.h ext/spl/spl_fixedarray.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71088@lists.php.net to get a copy of this message | ||
Commit: 30270af777fce6d4dbfbaafb37a431ae9f0bfc17
Author: Nikita Popov <nikic@php.net> Wed, 30 Jan 2013 20:34:01 +0100
Parents: d86e14b8f6bc7213d597cc6beb94a573fefb6889 bb4d11b405ae1f37a8b0e4db630e80c5678f0746
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=30270af777fce6d4dbfbaafb37a431ae9f0bfc17
Log:
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
configure.in
main/php_version.h
Changed paths:
MM Zend/zend_API.h
MM ext/spl/spl_fixedarray.c
Diff: