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