]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Thu, 12 Mar 2015 14:21:33 +0000 (15:21 +0100)
committerAnatol Belski <ab@php.net>
Thu, 12 Mar 2015 14:21:33 +0000 (15:21 +0100)
* PHP-5.5:
  create the php prefix if doesn't exist

1  2 
win32/build/confutils.js

Simple merge