summaryrefslogtreecommitdiff
path: root/ext/mcrypt/php_mcrypt.h
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2015-05-07 12:16:40 +0300
committerDmitry Stogov <dmitry@zend.com>2015-05-07 12:16:40 +0300
commit329513c3a75c5aba7a7f04cd21325132f7104d06 (patch)
tree54753085ab1a0246e6126f8e69b53e3299a66fcc /ext/mcrypt/php_mcrypt.h
parentac3ca0280a4716000da1bc1777f4dfded3eabdfc (diff)
parent8026001943109dea3f908b8dd0720a0de9781af6 (diff)
downloadphp-git-329513c3a75c5aba7a7f04cd21325132f7104d06.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Fixed bug #69549 (Memory leak with opcache.optimization_level=0xFFFFFFFF) Conflicts: NEWS
Diffstat (limited to 'ext/mcrypt/php_mcrypt.h')
0 files changed, 0 insertions, 0 deletions