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