diff options
| author | Anatol Belski <ab@php.net> | 2014-04-14 16:34:08 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-04-14 16:34:08 +0200 |
| commit | f6db1057fd690f85a70765c509580eb51db8c587 (patch) | |
| tree | 509a17a15236fd7e4f4a758a977fcfc39ae138d9 /ext/mysqlnd/php_mysqlnd.c | |
| parent | 57d657987d5750f9a6482c8a9999f30dd6aabe46 (diff) | |
| parent | 4268504084868b56ac8632aeca731eea2a4c7955 (diff) | |
| download | php-git-f6db1057fd690f85a70765c509580eb51db8c587.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
backported some ext/intl tests from 5.6 into 5.4
Conflicts:
ext/intl/tests/collator_get_sort_key_variant2.phpt
ext/intl/tests/locale_get_display_name3.phpt
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
0 files changed, 0 insertions, 0 deletions