]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e8728b4 0e023e9)
Merge branch 'PHP-5.6'
authorDaniel Lowrey <rdlowrey@php.net>
Sun, 13 Apr 2014 21:19:23 +0000 (15:19 -0600)
committerDaniel Lowrey <rdlowrey@php.net>
Sun, 13 Apr 2014 21:19:23 +0000 (15:19 -0600)
* PHP-5.6:
  Bug #66840: Fix broken build when extension built separately

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.