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/mbstring/oniguruma | |
| 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/mbstring/oniguruma')
| -rw-r--r-- | ext/mbstring/oniguruma/HISTORY | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mbstring/oniguruma/HISTORY b/ext/mbstring/oniguruma/HISTORY index 244cd3d150..7add6f9a90 100644 --- a/ext/mbstring/oniguruma/HISTORY +++ b/ext/mbstring/oniguruma/HISTORY @@ -878,7 +878,7 @@ History 2004/10/18: [impl] (thanks Imai Yasumasa) enclose #include <sys/types.h> by #ifndef __BORLANDC__. 2004/10/18: [bug] (thanks Imai Yasumasa) - memory acess violation in select_opt_exact_info(). + memory access violation in select_opt_exact_info(). 2004/09/25: [dist] fix doc/API and doc/API.ja. 2004/09/25: [bug] fix OP_SEMI_END_BUF process in match_at() for the case USE_NEWLINE_AT_END_OF_STRING_HAS_EMPTY_LINE |