summaryrefslogtreecommitdiff
path: root/ext/mcrypt/php_mcrypt.h
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2015-05-05 11:23:13 +0200
committerRemi Collet <remi@php.net>2015-05-05 11:23:13 +0200
commitac3ca0280a4716000da1bc1777f4dfded3eabdfc (patch)
treea45612fe4d5520ffa0729598de062b514191b957 /ext/mcrypt/php_mcrypt.h
parent741382d968aee33749f9afad10aaabbf9b73ba70 (diff)
parent33e2aa452d5b1c46e7b362450233a9fd84036cc9 (diff)
downloadphp-git-ac3ca0280a4716000da1bc1777f4dfded3eabdfc.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Relax tests failing on i386 with new zic
Diffstat (limited to 'ext/mcrypt/php_mcrypt.h')
0 files changed, 0 insertions, 0 deletions