com php-src: Merge branch 'PHP-5.5' into PHP-5.6: Zend/zend_c ompile.c
| From: | JulienPauli | Date: | Fri, 21 Nov 2014 14:50:27 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: Zend/zend_c ompile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83224@lists.php.net to get a copy of this message | ||
Commit: ab3525c40124cd569fbde32a0bb123348b1048bc
Author: Julien Pauli <jpauli@php.net> Fri, 21 Nov 2014 15:50:27 +0100
Parents: 64b9277867cb0da1a68a122b0a9fe6dfb78d9c84 cd3b46f28af49e5eaaa687d5d186e641ce147853
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ab3525c40124cd569fbde32a0bb123348b1048bc
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix #68185 - Inconsistent insteadof definition
Conflicts:
Zend/zend_compile.c
Bugs:
https://bugs.php.net/68185
Changed paths:
MM Zend/zend_compile.c
Diff: