diff options
author | Stanislav Malyshev <stas@php.net> | 2013-06-10 14:20:18 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2013-06-10 14:20:18 -0700 |
commit | ac40c0b562b0f90652cadef83968d7305626c377 (patch) | |
tree | 450cd9d7b67422adfae2218a69d21fb02f921474 /Zend/zend_API.c | |
parent | 04145dc2aa6eea37f7cd27ffa69ad3b2f52a65da (diff) | |
download | php-git-ac40c0b562b0f90652cadef83968d7305626c377.tar.gz |
Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
typofixes
Diffstat (limited to 'Zend/zend_API.c')
-rw-r--r-- | Zend/zend_API.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 529092ab92..e1f80c7171 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -1143,7 +1143,7 @@ ZEND_API void object_properties_init(zend_object *object, zend_class_entry *clas /* This function requires 'properties' to contain all props declared in the * class and all props being public. If only a subset is given or the class - * has protected members then you need to merge the properties seperately by + * has protected members then you need to merge the properties separately by * calling zend_merge_properties(). */ ZEND_API int _object_and_properties_init(zval *arg, zend_class_entry *class_type, HashTable *properties ZEND_FILE_LINE_DC TSRMLS_DC) /* {{{ */ { |