diff options
| author | Christopher Jones <sixd@php.net> | 2012-09-18 18:31:09 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2012-09-18 18:31:09 -0700 |
| commit | 4ec1a2ab04051b2768c7f4829137115dbf164133 (patch) | |
| tree | 407a412d4527a62318ab5a4d98ec7b8845b3bb04 /ext/mysql/php_mysql.c | |
| parent | 1a5545165145070c356108751bda462bb4363223 (diff) | |
| parent | ee172ce3cc65b5cb8ec49020c9579d108aca9ea1 (diff) | |
| download | php-git-4ec1a2ab04051b2768c7f4829137115dbf164133.tar.gz | |
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/repository/php-src:
Merging PR #116
Merged GitHub PR #190: Support for the HTTP PATCH method in CLI webserver
updated libary versions
split tests for the new zlib version on win
Fixed Bug #63103 (ext\curl\tests\bug62839.phpt broken)
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions