com php-src: Merge branch 'PHP-5.5' into PHP-5.6: win32/build/confutils.js
| From: | Anatol Belski | Date: | Mon, 21 Jul 2014 12:47:40 +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-79545@lists.php.net to get a copy of this message | ||
Commit: a6ecb873b9138f4334271c6da3b9c5a6f9f3e490
Author: Anatol Belski <ab@php.net> Mon, 21 Jul 2014 14:47:40 +0200
Parents: f6d941e4b451a09c80e852a2f9d54e41591c36d2 6fcd8e586509cf6530c513c5906ce9726230d8b3
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a6ecb873b9138f4334271c6da3b9c5a6f9f3e490
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix nmake snap when ext name is different in target dll
Changed paths:
MM win32/build/confutils.js
Diff: