diff options
author | Dmitry Stogov <dmitry@zend.com> | 2012-12-25 13:39:02 +0400 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2012-12-25 13:39:02 +0400 |
commit | 016f3c86103b30520317d8a1740fdb9b8c28df0a (patch) | |
tree | c30e4eb4f45bef7d96b32aa3c7ffb4e7fcba1206 /ext/mysql/php_mysql.c | |
parent | bc0425c02579dbbb9e9f9f38a835413c6c512eb3 (diff) | |
parent | f0b459b7c41b392c0958f0f8149980a95bce69fb (diff) | |
download | php-git-016f3c86103b30520317d8a1740fdb9b8c28df0a.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed ZTS build
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions