summaryrefslogtreecommitdiff
path: root/Zend/zend_alloc.h
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-08-04 10:34:07 +0200
committerAnatol Belski <ab@php.net>2014-08-04 10:34:07 +0200
commitc3c83bb078797b5cbb747af063229805a902d50a (patch)
treee5aee2a30fbf68da414c5cdb08b2159517109288 /Zend/zend_alloc.h
parent616275859e2b195e0ea8e90a26a0ed8801a80765 (diff)
parenteee03852b655368de51b9319677d02c0187e6fe6 (diff)
downloadphp-git-c3c83bb078797b5cbb747af063229805a902d50a.tar.gz
Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master: Patches #67739 PHP_INT_MIN and _MAX tests NEWS and UPGRADING Added PHP_INT_MIN Conflicts: main/main.c
Diffstat (limited to 'Zend/zend_alloc.h')
0 files changed, 0 insertions, 0 deletions