diff options
author | Stanislav Malyshev <stas@php.net> | 2014-04-13 17:03:28 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2014-04-13 17:03:28 -0700 |
commit | df8e34bcc133bec10daa01dee3c2eb0fe59bb4bb (patch) | |
tree | 785385483ab41f7baa118a49f1d73c6da2769616 /ext/mysqlnd/php_mysqlnd.c | |
parent | 733b09442d40ae2803ca1ffd073a74ca4a8ebb07 (diff) | |
parent | 3a2660b30254def0fdf7f955d89ac6ee331d5045 (diff) | |
download | php-git-df8e34bcc133bec10daa01dee3c2eb0fe59bb4bb.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix windows build
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
0 files changed, 0 insertions, 0 deletions