diff options
| author | Julien Pauli <jpauli@php.net> | 2014-10-01 16:22:07 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2014-10-01 16:22:07 +0200 |
| commit | af88793d6dd28c207264fa0440ba5744d1fdc36f (patch) | |
| tree | 60315858afe393e9687be2209f5da142dde4f06a /ext/mysql/php_mysql.c | |
| parent | f68da34119af90223c7f7118ff6c73f50e9bcdd4 (diff) | |
| download | php-git-af88793d6dd28c207264fa0440ba5744d1fdc36f.tar.gz | |
Revert "Merge branch 'PHP-5.4' into PHP-5.5"php-5.5.18RC1
This reverts commit 5ac2e5f850c483394870dadca465c1322a4a51cf, reversing
changes made to 58088c24eb55cfec3bebd1cb78cf1f5d89ac94ec.
Conflicts:
ext/openssl/xp_ssl.c
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions