diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-07-08 21:41:06 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-07-08 21:41:06 -0700 |
| commit | 393bf0e4bb30f357cd2512953cfdb8591522c9a9 (patch) | |
| tree | 17d3e86a22bde15bffa84037d14bf755817e4406 /ext/mysql/php_mysql.c | |
| parent | cd1130751d852ee16a164323bc415108a3e51bc8 (diff) | |
| parent | b93ea59665a5024abb10b398bed8f19db61b4756 (diff) | |
| download | php-git-393bf0e4bb30f357cd2512953cfdb8591522c9a9.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
5.4.31
fix unstable test
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions