]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 380741d 94d6cb4)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Sun, 1 Feb 2015 07:34:27 +0000 (23:34 -0800)
committerStanislav Malyshev <stas@php.net>
Sun, 1 Feb 2015 07:34:27 +0000 (23:34 -0800)
* PHP-5.4:
  fix TSRM

1  2 
ext/standard/dns.c patch | diff1 | diff2 | blob | history

diff --cc ext/standard/dns.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.