diff options
| author | Johannes Schlüter <johannes@php.net> | 2012-06-26 12:34:36 +0200 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2012-06-26 12:34:36 +0200 |
| commit | 02d8e8959b855e72b4d5cafc71666a1bbe3de672 (patch) | |
| tree | 32a6bf2660e9740f911e7fb4012e988de3825e84 /ext/mysqlnd/php_mysqlnd.c | |
| parent | d6e421f6a614ee90893469390f08cfe030f646a7 (diff) | |
| parent | 88cf472b92107ab021cb7074de58757bd0cdbf28 (diff) | |
| download | php-git-02d8e8959b855e72b4d5cafc71666a1bbe3de672.tar.gz | |
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src: (22 commits)
Fix bug #62373 (serialize() generates wrong reference to the object)
Update UPGRADING given 7596445
Fix typo in error message
BreakIterator: fix compat with old ICU versions
Fix build error one ext/intl
Duplicate test for ICU 49
Fix undeclared intl_locale_get_default()
Fix memory allocation checks for base64 encode
Improve json_encode error handling
- BFN
- BFN
- Improved fix for #62384
BreakIterator::getPartsIterator: new optional arg
Added IntlCodePointBreakIterator.
Add Intl prefix to BreakIterator/RuleBasedBI
Remove trailing space
Replaced zend_parse_method_params with plain zpp
BreakIter: Removed getAvailableLocales/getHashCode
Change in BreakIterator::getPartsIterator()
BreakIterator: add rules status constants
...
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
0 files changed, 0 insertions, 0 deletions