summaryrefslogtreecommitdiff
path: root/Zend/zend_API.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2013-08-29 10:31:14 +0400
committerDmitry Stogov <dmitry@zend.com>2013-08-29 10:31:14 +0400
commitb6864d978ce0692194e475dbba4189033202fd69 (patch)
tree8d3fb8e3145b8dbf2227f57017266bb00c28eec7 /Zend/zend_API.c
parent82bb2a25354f1396939d51292a69ef9e8f06a8ca (diff)
parent790db9ff9b95d9dfaf6720593517dc0368f1fe7f (diff)
downloadphp-git-b6864d978ce0692194e475dbba4189033202fd69.tar.gz
Merge branch 'PHP-5.5'
* PHP-5.5: Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4). (Terry Ellison) Conflicts: NEWS
Diffstat (limited to 'Zend/zend_API.c')
0 files changed, 0 insertions, 0 deletions