diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-11-30 17:34:20 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-11-30 17:34:51 -0800 |
| commit | aae5d4d9db27a11f9118546fa16c57132704b889 (patch) | |
| tree | 776324583df29f77568356034d8c9fe5ac479a63 /ext | |
| parent | 60d5b2ec24625e399b862eb1dff92c32d54386c7 (diff) | |
| parent | ffb62112f86b047c7e2881dbadd2647c4729c54e (diff) | |
| download | php-git-aae5d4d9db27a11f9118546fa16c57132704b889.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Update NEWS
fix typo
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/intl/collator/collator_attr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/intl/collator/collator_attr.h b/ext/intl/collator/collator_attr.h index 85636cc486..8bd91b02c1 100644 --- a/ext/intl/collator/collator_attr.h +++ b/ext/intl/collator/collator_attr.h @@ -16,7 +16,7 @@ */ #ifndef COLLATOR_ATTR_H -#define CCOLLATOR_ATTR_H +#define COLLATOR_ATTR_H #include <php.h> |