com php-src: Merge branch 'PHP-7.0' into PHP-7.1: win32/build/confutils.js
| From: | Anatol Belski | Date: | Fri, 04 Nov 2016 17:43:56 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0' into PHP-7.1: win32/build/confutils.js | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-95401@lists.php.net to get a copy of this message | ||
Commit: 86ae78d7c67cf9b43dbee0033557058e5901047f
Author: Anatol Belski <ab@php.net> Fri, 4 Nov 2016 18:43:56 +0100
Parents: d73af63ec9c38329f0c7dae8464b87e9c516cae9 cf4f168d4cf0609f7d7247f834331989e3c0f901
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=86ae78d7c67cf9b43dbee0033557058e5901047f
Log:
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
rename the tmp ini file, to keep it consistent with m4 variant
Changed paths:
MM win32/build/confutils.js
Diff: