]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e5aae35 3430d85)
Merge branch 'PHP-7.4' into PHP-8.0
authorNikita Popov <nikita.ppv@gmail.com>
Fri, 27 Nov 2020 16:04:50 +0000 (17:04 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Fri, 27 Nov 2020 16:04:50 +0000 (17:04 +0100)
* PHP-7.4:
  Fix build for non-x86

1  2 
Zend/zend_cpuinfo.c patch | diff1 | diff2 | blob | history

diff --cc Zend/zend_cpuinfo.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.