com php-src: Merge branch 'PHP-5.5' into PHP-5.6: win32/build/confutils.js
| From: | Anatol Belski | Date: | Thu, 10 Jul 2014 20:35:23 +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-79408@lists.php.net to get a copy of this message | ||
Commit: 63abaa6d69236c4abf06a00fbc64908e29b7ab81
Author: Anatol Belski <ab@php.net> Thu, 10 Jul 2014 22:35:23 +0200
Parents: fbc21af87b752b99f6b78503cadc89dbba6c98f1 efcc789ef860742ca59db3723b3fad0e519d6461
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=63abaa6d69236c4abf06a00fbc64908e29b7ab81
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix end of stream exception when generating makefile
Changed paths:
MM win32/build/confutils.js
Diff: