]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Wed, 18 Jan 2017 17:46:11 +0000 (17:46 +0000)
committerJoe Watkins <krakjoe@php.net>
Wed, 18 Jan 2017 17:46:11 +0000 (17:46 +0000)
commitbbe21ccf3877835d8c7c6aaadcbd9e4d20054c8b
treebd3b1a946c57e9b358d3e3f21372f9f099a44119
parentbce548d8e699c8e7d1a0cbbeb0ce4de4b0f0131d
parentfb8486f3bdd84d92da7c05e6e3c226df71c574da
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Remove remnants of TSMRLS_* macro calls
sapi/cli/php_cli_server.c
sapi/litespeed/lsapi_main.c