diff options
author | Stanislav Malyshev <stas@php.net> | 2015-05-09 18:56:25 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2015-05-09 18:57:18 -0700 |
commit | 33594b78ec533127282a542d1e78b62df9e2dd4f (patch) | |
tree | d10d8e2e15443c74c5e632e73d2246f88062ade3 /ext/mcrypt/php_mcrypt.h | |
parent | 329513c3a75c5aba7a7f04cd21325132f7104d06 (diff) | |
parent | 473ec539a1c3d242c8b171dd6a5a98fa17e05c13 (diff) | |
download | php-git-33594b78ec533127282a542d1e78b62df9e2dd4f.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix #48147 - implement manual handling of //IGNORE for broken libc
Diffstat (limited to 'ext/mcrypt/php_mcrypt.h')
0 files changed, 0 insertions, 0 deletions