diff options
| author | Daniel Lowrey <rdlowrey@php.net> | 2014-02-19 04:01:08 -0700 |
|---|---|---|
| committer | Daniel Lowrey <rdlowrey@php.net> | 2014-02-19 04:01:08 -0700 |
| commit | a7d36066507b8d43c4a63bb60ba3ec1de3b68aaf (patch) | |
| tree | 068ea65c4deabd1c4f033402c0cef6f870cad5fb /ext/mysql/php_mysql.c | |
| parent | 8dd99dd2dc748b323f18619fa7bfa940e8d4dd9a (diff) | |
| parent | 633f898f1520253d3530fe91fc82f68bca7c4627 (diff) | |
| download | php-git-a7d36066507b8d43c4a63bb60ba3ec1de3b68aaf.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Skip failing tests when EC unavailable (RHEL)
Conflicts:
ext/openssl/openssl.c
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions