diff options
author | Ferenc Kovacs <tyrael@php.net> | 2014-08-12 14:48:48 +0200 |
---|---|---|
committer | Ferenc Kovacs <tyrael@php.net> | 2014-08-12 14:48:48 +0200 |
commit | 86aa8d25236b71830c35901646041f627519e9aa (patch) | |
tree | ec0881f1d4887e4de8901f06ae2a23d2bdd3c476 /win32/php_stdint.h | |
parent | 91351d4bf55d9937186739e528330e287d7bbc84 (diff) | |
parent | 844e2e81f56fca1f49c73df4e15866cd1ba37f30 (diff) | |
download | php-git-86aa8d25236b71830c35901646041f627519e9aa.tar.gz |
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS entry for e6d93a1 / d73d44c
restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
Revert "Merge branch 'pull-request/694' into PHP-5.6"
Diffstat (limited to 'win32/php_stdint.h')
0 files changed, 0 insertions, 0 deletions