diff options
author | Christopher Jones <sixd@php.net> | 2012-09-18 18:31:13 -0700 |
---|---|---|
committer | Christopher Jones <sixd@php.net> | 2012-09-18 18:31:13 -0700 |
commit | 2a352f6af790c820578e7f543907cab304de82fa (patch) | |
tree | c4a5f967a093ceaee93b8e4c012cb676dd789689 /ext/mysql/php_mysql.c | |
parent | d90a7f15001528cd149b4f119269905da2486684 (diff) | |
parent | 6793e09a4ef164fac343e50c39d284fbbe3e6050 (diff) | |
download | php-git-2a352f6af790c820578e7f543907cab304de82fa.tar.gz |
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' 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