diff options
author | Stanislav Malyshev <stas@php.net> | 2013-08-04 16:06:24 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2013-08-04 16:06:24 -0700 |
commit | c793a6569013f9ab46f2cd7331cc1a04aa42cbed (patch) | |
tree | ba42379833bfa8176f468bfb23d24cd8ec3019e1 /ext/reflection | |
parent | 3626db6142eda230586357a707b6cb4a0887e971 (diff) | |
parent | 8d86597d7368460383a33a4399ea7a8b244cd6fa (diff) | |
download | php-git-c793a6569013f9ab46f2cd7331cc1a04aa42cbed.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
non living code related typo fixes
Conflicts:
Zend/zend_compile.c
Diffstat (limited to 'ext/reflection')
-rw-r--r-- | ext/reflection/php_reflection.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index b65ccaa26d..b1f7484f24 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -5259,7 +5259,7 @@ ZEND_METHOD(reflection_extension, getVersion) /* }}} */ /* {{{ proto public ReflectionFunction[] ReflectionExtension::getFunctions() - Returns an array of this extension's fuctions */ + Returns an array of this extension's functions */ ZEND_METHOD(reflection_extension, getFunctions) { reflection_object *intern; |