com php-src: Merge branch 'PHP-5.5' into PHP-5.6: win32/build/confutils.js
| From: | Anatol Belski | Date: | Sun, 31 May 2015 21:02:01 +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-87024@lists.php.net to get a copy of this message | ||
Commit: 34bcd69f824a724fa5272cd0c2dc649fec8a4f13
Author: Anatol Belski <ab@php.net> Sun, 31 May 2015 23:02:01 +0200
Parents: 6f1c006b6d9c25324acdff421dbeee8a8a901230 f029a2856b40dfb9093b85414c3e7419c43516f4
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=34bcd69f824a724fa5272cd0c2dc649fec8a4f13
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix phpize mode for manifest embedding
Changed paths:
MM win32/build/confutils.js
Diff: