]> granicus.if.org Git - php/commit
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)
commitaee20e637a8510acea40feb083ad307bfcbdb758
tree4a154e8efb5317e213568d533d2be489c6616362
parent21c6ba3412ef863652bb05dfedcd4a8d8f4f044c
parent159e5c1048340fc4eecd231dff0903b59729ca3a
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  use AC_DEFINE + win32