]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21c6ba3 159e5c1)
Merge branch 'PHP-7.0' into PHP-7.1
authorRemi Collet <remi@php.net>
Fri, 4 Aug 2017 11:21:41 +0000 (13:21 +0200)
committerRemi Collet <remi@php.net>
Fri, 4 Aug 2017 11:21:41 +0000 (13:21 +0200)
* PHP-7.0:
  use AC_DEFINE + win32


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.