diff options
author | Lior Kaplan <kaplanlior@gmail.com> | 2014-08-17 21:34:03 +0300 |
---|---|---|
committer | Lior Kaplan <kaplanlior@gmail.com> | 2014-08-17 21:34:03 +0300 |
commit | f1d0e50ea8915a18ab5bf24402b787c35552e162 (patch) | |
tree | 3a009414fc2fa71144e861a69a3b2b777f3cbfc8 /ext/mbstring/mb_gpc.c | |
parent | 56d02d564e946a03e397297d5d5ded112eefd928 (diff) | |
parent | fac08a960be6124829177f6c33c2b10aa3fd81b9 (diff) | |
download | php-git-f1d0e50ea8915a18ab5bf24402b787c35552e162.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Correct typo in comments: 'initialized'
Diffstat (limited to 'ext/mbstring/mb_gpc.c')
-rw-r--r-- | ext/mbstring/mb_gpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mbstring/mb_gpc.c b/ext/mbstring/mb_gpc.c index 8036485d6d..8a765fefdd 100644 --- a/ext/mbstring/mb_gpc.c +++ b/ext/mbstring/mb_gpc.c @@ -260,7 +260,7 @@ const mbfl_encoding *_php_mb_encoding_handler_ex(const php_mb_encoding_handler_i goto out; } - num = n; /* make sure to process initilized vars only */ + num = n; /* make sure to process initialized vars only */ /* initialize converter */ if (info->num_from_encodings <= 0) { |