]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d4d05c8 e892f53)
Merge branch 'PHP-5.5' into PHP-5.6
authorDaniel Lowrey <rdlowrey@php.net>
Thu, 5 Mar 2015 19:13:33 +0000 (12:13 -0700)
committerDaniel Lowrey <rdlowrey@php.net>
Thu, 5 Mar 2015 19:13:33 +0000 (12:13 -0700)
* PHP-5.5:
  Fix ZTS build

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

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