com php-src: Merge branch 'PHP-5.5' into PHP-5.6: sapi/fpm/config.m4 win32/build/confutils.js
| From: | Xinchen Hui | Date: | Fri, 25 Jul 2014 02:52:41 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: sapi/fpm/config.m4 win32/build/confutils.js | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79586@lists.php.net to get a copy of this message | ||
Commit: 235d0241d1264085c2e24b0ed02d1fdff35b2313
Author: Xinchen Hui <laruence@php.net> Fri, 25 Jul 2014 10:52:41 +0800
Parents: 1d2f232bd29dd29045c7389cf9d23b1ad2fd4db8 4ae1d5d1bd34cb5bb255ffdc6c8e96ce25e70fcf
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=235d0241d1264085c2e24b0ed02d1fdff35b2313
Log:
Merge branch 'PHP-5.5' into PHP-5.6
Changed paths:
MM sapi/fpm/config.m4
MM win32/build/confutils.js
Diff: