]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8dd99dd 633f898)
Merge branch 'PHP-5.4' into PHP-5.5
authorDaniel Lowrey <rdlowrey@php.net>
Wed, 19 Feb 2014 11:01:08 +0000 (04:01 -0700)
committerDaniel Lowrey <rdlowrey@php.net>
Wed, 19 Feb 2014 11:01:08 +0000 (04:01 -0700)
* PHP-5.4:
  Skip failing tests when EC unavailable (RHEL)

Conflicts:
ext/openssl/openssl.c

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.