]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 64b9277 cd3b46f)
Merge branch 'PHP-5.5' into PHP-5.6
authorJulien Pauli <jpauli@php.net>
Fri, 21 Nov 2014 14:50:27 +0000 (15:50 +0100)
committerJulien Pauli <jpauli@php.net>
Fri, 21 Nov 2014 14:50:27 +0000 (15:50 +0100)
* PHP-5.5:
  Fix #68185 - Inconsistent insteadof definition

Conflicts:
Zend/zend_compile.c

1  2 
Zend/zend_compile.c patch | diff1 | diff2 | blob | history

diff --cc Zend/zend_compile.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.