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 /Zend/zend_globals.h | |
| 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 'Zend/zend_globals.h')
| -rw-r--r-- | Zend/zend_globals.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h index 800bdc7f66..b9a5b39914 100644 --- a/Zend/zend_globals.h +++ b/Zend/zend_globals.h @@ -302,7 +302,7 @@ struct _zend_php_scanner_globals { unsigned char *script_filtered; size_t script_filtered_size; - /* input/ouput filters */ + /* input/output filters */ zend_encoding_filter input_filter; zend_encoding_filter output_filter; const zend_encoding *script_encoding; |