]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e7df0af a7dad26)
Merge branch 'PHP-5.6'
authorTjerk Meesters <datibbaw@php.net>
Tue, 29 Jul 2014 11:15:20 +0000 (19:15 +0800)
committerTjerk Meesters <datibbaw@php.net>
Tue, 29 Jul 2014 11:15:20 +0000 (19:15 +0800)
* PHP-5.6:
  Wildcards should only be used in the first name component; fixed comment style

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.