]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: adc4265 5ff77b0)
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Fri, 13 Feb 2015 12:40:10 +0000 (13:40 +0100)
committerAnatol Belski <ab@php.net>
Fri, 13 Feb 2015 12:40:10 +0000 (13:40 +0100)
* PHP-5.5:
  fix condition

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.