]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorDaniel Lowrey <rdlowrey@php.net>
Tue, 18 Feb 2014 00:38:49 +0000 (19:38 -0500)
committerDaniel Lowrey <rdlowrey@php.net>
Tue, 18 Feb 2014 00:38:49 +0000 (19:38 -0500)
* PHP-5.5:
  Fixed broken build when EC unavailable

1  2 
ext/openssl/openssl.c

index 43682a67d6913bd4f52c8eaf2e4e10aa1d2091cf,f1e582b20a271a85e7f65636496ac3153ac2f73c..31704e5254ccd5fcfa7f2d6fd5cc307ba9651119
mode 100644,100755..100755