]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorJoe Watkins <krakjoe@php.net>
Tue, 18 Jun 2019 08:27:50 +0000 (10:27 +0200)
committerJoe Watkins <krakjoe@php.net>
Tue, 18 Jun 2019 08:27:50 +0000 (10:27 +0200)
* PHP-7.4:
  Turn system_id into a true global

1  2 
ext/opcache/ZendAccelerator.c
ext/opcache/ZendAccelerator.h
ext/opcache/shared_alloc_win32.c
ext/opcache/zend_file_cache.c

Simple merge
Simple merge
Simple merge
Simple merge