com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqli/my sqli_nonapi.c main/output.c
| From: | Xinchen Hui | Date: | Fri, 30 Nov 2012 06:30:37 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqli/my sqli_nonapi.c main/output.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70623@lists.php.net to get a copy of this message | ||
Commit: 093d11959782f5bb66c6e688da542a4243770ed7
Author: Xinchen Hui <laruence@php.net> Fri, 30 Nov 2012 14:30:37 +0800
Parents: 9e1d3cfdabf8665aec4d121bafa31cddd6ca7231 b6898195674a26bf6588c284a6a2616bbaaa908f
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=093d11959782f5bb66c6e688da542a4243770ed7
Log:
Merge branch 'PHP-5.4' into PHP-5.5
Changed paths:
MM ext/mysqli/mysqli_nonapi.c
MM main/output.c
Diff: