diff options
| author | Stanislav Malyshev <stas@php.net> | 2012-12-04 21:33:31 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2012-12-04 21:33:31 -0800 |
| commit | 16b1d45e6935faef042c73439497b481db2307c6 (patch) | |
| tree | 08011460d507151055783ef7be7d6aafe0cacfb7 /ext/mysql/php_mysql.c | |
| parent | 266059d6f05faa23abaa8da05f70f9830b8ad9ca (diff) | |
| parent | c3b6f6feed6ba4af04a90785988a104cd3ff1e54 (diff) | |
| download | php-git-16b1d45e6935faef042c73439497b481db2307c6.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
5.4.11-dev
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions