diff options
| author | Daniel Lowrey <rdlowrey@php.net> | 2014-02-01 08:25:01 -0700 |
|---|---|---|
| committer | Daniel Lowrey <rdlowrey@php.net> | 2014-02-01 08:25:01 -0700 |
| commit | f08e8772a7671482ea8f911978965bada9137c42 (patch) | |
| tree | 83f54631f80a21bf2894142e00c663d8ae21cd04 | |
| parent | 0893a13e3219bbd98880eb7f1a31082bc80f5ad4 (diff) | |
| parent | 05c309f2d85bcc33e95415d7f50d7748a7c27498 (diff) | |
| download | php-git-f08e8772a7671482ea8f911978965bada9137c42.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Remove #if PHP_VERSION_ID version checks
Conflicts:
ext/openssl/xp_ssl.c
0 files changed, 0 insertions, 0 deletions