diff options
| author | Lior Kaplan <kaplanlior@gmail.com> | 2014-08-17 15:48:22 +0300 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2014-08-17 15:48:22 +0300 |
| commit | be2128c8050fd8d22604acb0e225891551c81c8c (patch) | |
| tree | a762e220562999130449272443fe9cde49ce9957 /ext/pcre | |
| parent | 6279246d2c60437c583f9c273075579bf17be654 (diff) | |
| parent | 3f42f2f5d1c8026b6e1d21b91857a08d918c28c8 (diff) | |
| download | php-git-be2128c8050fd8d22604acb0e225891551c81c8c.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
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. |