summaryrefslogtreecommitdiff
path: root/ext/mbstring
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2012-10-09 13:30:22 +0800
committerXinchen Hui <laruence@php.net>2012-10-09 13:30:22 +0800
commit75a2c0d71555a432db170b37720a4f3b4cd8f224 (patch)
tree3de128d1be145966b25f82396f3a88ad97693867 /ext/mbstring
parent14bfd3126c324861c1cbccb702c7cd5d3d6308ee (diff)
parente4a8fa6a15d2aa8645d1ad4f4724cb1c628e6916 (diff)
downloadphp-git-75a2c0d71555a432db170b37720a4f3b4cd8f224.tar.gz
Merge branch 'PHP-5.4'
Diffstat (limited to 'ext/mbstring')
-rw-r--r--[-rwxr-xr-x]ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c0
-rw-r--r--[-rwxr-xr-x]ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.h0
-rw-r--r--[-rwxr-xr-x]ext/mbstring/libmbfl/mbfl/mbfl_defs.h0
-rw-r--r--[-rwxr-xr-x]ext/mbstring/oniguruma/enc/utf16_be.c0
-rw-r--r--[-rwxr-xr-x]ext/mbstring/oniguruma/enc/utf16_le.c0
-rw-r--r--[-rwxr-xr-x]ext/mbstring/oniguruma/enc/utf32_be.c0
-rw-r--r--[-rwxr-xr-x]ext/mbstring/oniguruma/enc/utf32_le.c0
-rw-r--r--[-rwxr-xr-x]ext/mbstring/oniguruma/regext.c0
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 1e909ebbf2..1e909ebbf2 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 5cc0759117..5cc0759117 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 b4f822607c..b4f822607c 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 8f413bfc74..8f413bfc74 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 b1b957b40c..b1b957b40c 100755..100644
--- a/ext/mbstring/oniguruma/regext.c
+++ b/ext/mbstring/oniguruma/regext.c