]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ea9f24 cf842f1)
Merge branch 'PHP-7.0'
authorStanislav Malyshev <stas@php.net>
Thu, 18 Feb 2016 06:37:03 +0000 (22:37 -0800)
committerStanislav Malyshev <stas@php.net>
Thu, 18 Feb 2016 06:37:03 +0000 (22:37 -0800)
* PHP-7.0:
  Remove TSRMLS_* from docs as it's not used anymore

Conflicts:
ext/intl/ERROR.CONVENTIONS


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.