]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Sun, 26 Jan 2014 23:51:27 +0000 (15:51 -0800)
committerStanislav Malyshev <stas@php.net>
Sun, 26 Jan 2014 23:51:27 +0000 (15:51 -0800)
commit498d94d13746cdc6d52cb894a2d7f1d4d4dbd2ae
treec4a6e9ffa7162b3b421d36f7fe3e7d08295f86a3
parent1dcaa109a1a9c41f3eb8da001c6778cb2b1d8899
parentd5560faaa3595c4aaf46329e4714432c42244503
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  drop precision since trigonometric functions are non-portable
  XFAIL multibyte tests until they are fixed (bug 66582)