diff options
| author | Anatol Belski <ab@php.net> | 2015-04-04 21:50:18 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-04-04 21:50:18 +0200 |
| commit | b1997278fdb71837ca81f092708fc05108bbfc9c (patch) | |
| tree | 8f48c9b4604e33032528aa1d06ad86f9493137db /ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp | |
| parent | baf5fdf59863b75917cee1d65d632e9dc8c6d6a6 (diff) | |
| parent | 8751e0fe719f90863354917dcd493f3a4b18ab02 (diff) | |
| download | php-git-b1997278fdb71837ca81f092708fc05108bbfc9c.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
added test for bug #69354
revert skipif, this should run everywhere
further ODBC 3.0 compliance
more compliance with the ODBC 3.0
test fixes
Diffstat (limited to 'ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp')
0 files changed, 0 insertions, 0 deletions