]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Thu, 17 Jul 2014 07:26:46 +0000 (09:26 +0200)
committerAnatol Belski <ab@php.net>
Thu, 17 Jul 2014 07:26:46 +0000 (09:26 +0200)
* PHP-5.4:
  implemented force usage of generated .h and .js deps in phpize mode

1  2 
win32/build/confutils.js

Simple merge