com php-src: Merge branch 'PHP-5.6': ext/gmp/gmp.c sapi/litespe ed/lsapi_main.c
| From: | Nikita Popov | Date: | Thu, 04 Sep 2014 19:23:11 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/gmp/gmp.c sapi/litespe ed/lsapi_main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81428@lists.php.net to get a copy of this message | ||
Commit: 00805ffb92077bb51d83ad7d0475a501589a7f21
Author: Nikita Popov <nikic@php.net> Thu, 4 Sep 2014 21:23:11 +0200
Parents: 6f6541dc84c34e7ed2fbe1584cb8db2842789b26 03797a73b25996315b6c6ce606a9d8724439699e
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=00805ffb92077bb51d83ad7d0475a501589a7f21
Log:
Merge branch 'PHP-5.6'
Conflicts:
ext/soap/php_http.c
Changed paths:
MM ext/gmp/gmp.c
MM sapi/litespeed/lsapi_main.c
Diff: