]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a04c553 84a4041)
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Thu, 7 Aug 2014 17:50:25 +0000 (19:50 +0200)
committerAnatol Belski <ab@php.net>
Thu, 7 Aug 2014 17:50:25 +0000 (19:50 +0200)
* PHP-5.4:
  fix TS build

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

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