com php-src: Merge branch 'PHP-5.4' into PHP-5.5: win32/build/confutils.js
| From: | Anatol Belski | Date: | Thu, 10 Jul 2014 17:36:04 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: win32/build/confutils.js | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79371@lists.php.net to get a copy of this message | ||
Commit: ec6b367722b13c03d05360e119ab080b722d1a33
Author: Anatol Belski <ab@php.net> Thu, 10 Jul 2014 19:36:04 +0200
Parents: eb7bf5d30ae3fa8df8790e9143eba12a084fe76e e2b0d97950cf4968432dce7f0d270f30e7e72fd7
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ec6b367722b13c03d05360e119ab080b722d1a33
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
turn off PGO in phpize mode
Fixed typo in Makefile.frag
Changed paths:
MM win32/build/confutils.js
Diff: