]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Thu, 17 Jul 2014 19:49:08 +0000 (21:49 +0200)
committerAnatol Belski <ab@php.net>
Thu, 17 Jul 2014 19:49:08 +0000 (21:49 +0200)
* PHP-5.5:
  implemented usage of the non core ext deps in phpize mode

1  2 
win32/build/confutils.js

Simple merge