]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fbc21af efcc789)
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Thu, 10 Jul 2014 20:35:23 +0000 (22:35 +0200)
committerAnatol Belski <ab@php.net>
Thu, 10 Jul 2014 20:35:23 +0000 (22:35 +0200)
* PHP-5.5:
  fix end of stream exception when generating makefile

1  2 
win32/build/confutils.js patch | diff1 | diff2 | blob | history

diff --cc win32/build/confutils.js
Simple merge
Unnamed repository; edit this file 'description' to name the repository.