diff options
author | Stanislav Malyshev <stas@php.net> | 2014-01-26 15:51:38 -0800 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2014-01-26 15:51:38 -0800 |
commit | 561317898c2c531bc9f91c8747cc0458b4c88e97 (patch) | |
tree | a493e57752bfbca00d3b872fadcbc263e97f90e9 /ext/json/json.c | |
parent | 2fac5e566994faa6cf5dfdb0d79d8f20717cb2ad (diff) | |
parent | 498d94d13746cdc6d52cb894a2d7f1d4d4dbd2ae (diff) | |
download | php-git-561317898c2c531bc9f91c8747cc0458b4c88e97.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
drop precision since trigonometric functions are non-portable
XFAIL multibyte tests until they are fixed (bug 66582)
Diffstat (limited to 'ext/json/json.c')
0 files changed, 0 insertions, 0 deletions