diff options
| author | Lior Kaplan <kaplanlior@gmail.com> | 2014-08-17 15:51:15 +0300 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2014-08-17 15:51:15 +0300 |
| commit | 56d02d564e946a03e397297d5d5ded112eefd928 (patch) | |
| tree | 7615f37956b630310fcfc9ba083174e58154f48a /ext/pcre | |
| parent | c6d9bf294681486e7d0ae67b099c0f45e88b35ac (diff) | |
| parent | be2128c8050fd8d22604acb0e225891551c81c8c (diff) | |
| download | php-git-56d02d564e946a03e397297d5d5ded112eefd928.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
typofixes
Diffstat (limited to 'ext/pcre')
| -rw-r--r-- | ext/pcre/pcrelib/ChangeLog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pcre/pcrelib/ChangeLog b/ext/pcre/pcrelib/ChangeLog index 1f1e860035..1e5fd3274a 100644 --- a/ext/pcre/pcrelib/ChangeLog +++ b/ext/pcre/pcrelib/ChangeLog @@ -5311,7 +5311,7 @@ by an auxiliary program - but can then be edited by hand if required. There are now no calls to isalnum(), isspace(), isdigit(), isxdigit(), tolower() or toupper() in the code. -7. Turn the malloc/free funtions variables into pcre_malloc and pcre_free and +7. Turn the malloc/free functions variables into pcre_malloc and pcre_free and make them global. Abolish the function for setting them, as the caller can now set them directly. |