diff options
| author | Xinchen Hui <laruence@php.net> | 2012-10-09 13:29:51 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-10-09 13:29:51 +0800 |
| commit | e4a8fa6a15d2aa8645d1ad4f4724cb1c628e6916 (patch) | |
| tree | d43f1db77088eedc669c2027e80355f7cdfa06f9 /ext/mbstring | |
| parent | 931571260b28bec7c53e57803e03ee0c38e8595e (diff) | |
| parent | 6284ef112ef870b791b8dfab36a39c4664744cc5 (diff) | |
| download | php-git-e4a8fa6a15d2aa8645d1ad4f4724cb1c628e6916.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
Diffstat (limited to 'ext/mbstring')
| -rw-r--r--[-rwxr-xr-x] | ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | ext/mbstring/libmbfl/mbfl/mbfl_defs.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | ext/mbstring/oniguruma/enc/utf16_be.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | ext/mbstring/oniguruma/enc/utf16_le.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | ext/mbstring/oniguruma/enc/utf32_be.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | ext/mbstring/oniguruma/enc/utf32_le.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | ext/mbstring/oniguruma/regext.c | 0 |
8 files changed, 0 insertions, 0 deletions
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c index 8f12feb47e..8f12feb47e 100755..100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.h b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.h index a5e2d2fbef..a5e2d2fbef 100755..100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.h diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_defs.h b/ext/mbstring/libmbfl/mbfl/mbfl_defs.h index fcfac2b899..fcfac2b899 100755..100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_defs.h +++ b/ext/mbstring/libmbfl/mbfl/mbfl_defs.h diff --git a/ext/mbstring/oniguruma/enc/utf16_be.c b/ext/mbstring/oniguruma/enc/utf16_be.c index 6ab80a6c1c..6ab80a6c1c 100755..100644 --- a/ext/mbstring/oniguruma/enc/utf16_be.c +++ b/ext/mbstring/oniguruma/enc/utf16_be.c diff --git a/ext/mbstring/oniguruma/enc/utf16_le.c b/ext/mbstring/oniguruma/enc/utf16_le.c index 2248e4910f..2248e4910f 100755..100644 --- a/ext/mbstring/oniguruma/enc/utf16_le.c +++ b/ext/mbstring/oniguruma/enc/utf16_le.c diff --git a/ext/mbstring/oniguruma/enc/utf32_be.c b/ext/mbstring/oniguruma/enc/utf32_be.c index 75133ca262..75133ca262 100755..100644 --- a/ext/mbstring/oniguruma/enc/utf32_be.c +++ b/ext/mbstring/oniguruma/enc/utf32_be.c diff --git a/ext/mbstring/oniguruma/enc/utf32_le.c b/ext/mbstring/oniguruma/enc/utf32_le.c index 21dca10c11..21dca10c11 100755..100644 --- a/ext/mbstring/oniguruma/enc/utf32_le.c +++ b/ext/mbstring/oniguruma/enc/utf32_le.c diff --git a/ext/mbstring/oniguruma/regext.c b/ext/mbstring/oniguruma/regext.c index f5ad1f35a2..f5ad1f35a2 100755..100644 --- a/ext/mbstring/oniguruma/regext.c +++ b/ext/mbstring/oniguruma/regext.c |