diff options
author | Stanislav Malyshev <stas@php.net> | 2014-04-13 17:04:00 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2014-04-13 17:04:00 -0700 |
commit | 04a11b850a17103d5a508932c768d423fbf6d870 (patch) | |
tree | 78653754d804adb2164416ef4a99a6fbcbabae7b /ext/mysqlnd/php_mysqlnd.c | |
parent | d3c4292db7b905b7ff4f2d95ab2ecf0337a78ccc (diff) | |
parent | df8e34bcc133bec10daa01dee3c2eb0fe59bb4bb (diff) | |
download | php-git-04a11b850a17103d5a508932c768d423fbf6d870.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix windows build
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
0 files changed, 0 insertions, 0 deletions