]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 53c0a04 62bed40)
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Thu, 29 Sep 2016 11:02:03 +0000 (13:02 +0200)
committerAnatol Belski <ab@php.net>
Thu, 29 Sep 2016 11:02:03 +0000 (13:02 +0200)
* PHP-7.0:
  sync win32 makefile with makedist zendparse exports

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.