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