]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Thu, 16 Nov 2017 14:10:04 +0000 (17:10 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 16 Nov 2017 14:10:04 +0000 (17:10 +0300)
* 'master' of git.php.net:php-src:
  Fix (*NO_JIT) usage when JIT is enabled
  Refactor ASCII to wide conversion

1  2 
ext/pcre/php_pcre.c

Simple merge