Commit:    75a2c0d71555a432db170b37720a4f3b4cd8f224
Author:    Xinchen Hui <larue...@php.net>         Tue, 9 Oct 2012 13:30:22 +0800
Parents:   14bfd3126c324861c1cbccb702c7cd5d3d6308ee 
e4a8fa6a15d2aa8645d1ad4f4724cb1c628e6916
Branches:  master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=75a2c0d71555a432db170b37720a4f3b4cd8f224

Log:
Merge branch 'PHP-5.4'

Changed paths:
  MM  ext/mbstring/oniguruma/enc/utf16_be.c
  MM  ext/mbstring/oniguruma/enc/utf16_le.c
  MM  ext/mbstring/oniguruma/enc/utf32_be.c
  MM  ext/mbstring/oniguruma/enc/utf32_le.c
  MM  ext/mbstring/oniguruma/regext.c
  MM  ext/pcntl/pcntl.c
  MM  ext/pdo/php_pdo_int.h
  MM  ext/pdo_mysql/mysql_driver.c
  MM  ext/spl/spl_iterators.c
  MM  main/php_streams.h
  MM  main/streams/streams.c


Diff:
diff --cc ext/mbstring/oniguruma/enc/utf16_be.c
index 1e909eb,6ab80a6..1e909eb
mode 100755,100644..100644
--- a/ext/mbstring/oniguruma/enc/utf16_be.c
+++ b/ext/mbstring/oniguruma/enc/utf16_be.c
diff --cc ext/mbstring/oniguruma/enc/utf16_le.c
index 5cc0759,2248e49..5cc0759
mode 100755,100644..100644
--- a/ext/mbstring/oniguruma/enc/utf16_le.c
+++ b/ext/mbstring/oniguruma/enc/utf16_le.c
diff --cc ext/mbstring/oniguruma/enc/utf32_be.c
index b4f8226,75133ca..b4f8226
mode 100755,100644..100644
--- a/ext/mbstring/oniguruma/enc/utf32_be.c
+++ b/ext/mbstring/oniguruma/enc/utf32_be.c
diff --cc ext/mbstring/oniguruma/enc/utf32_le.c
index 8f413bf,21dca10..8f413bf
mode 100755,100644..100644
--- a/ext/mbstring/oniguruma/enc/utf32_le.c
+++ b/ext/mbstring/oniguruma/enc/utf32_le.c
diff --cc ext/mbstring/oniguruma/regext.c
index b1b957b,f5ad1f3..b1b957b
mode 100755,100644..100644
--- a/ext/mbstring/oniguruma/regext.c
+++ b/ext/mbstring/oniguruma/regext.c
diff --cc ext/pcntl/pcntl.c
index 108119a,8647e10..108119a
mode 100755,100644..100644
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
diff --cc ext/pdo/php_pdo_int.h
index 9a7a64e,16a8f0e..9a7a64e
mode 100755,100644..100644
--- a/ext/pdo/php_pdo_int.h
+++ b/ext/pdo/php_pdo_int.h
diff --cc ext/pdo_mysql/mysql_driver.c
index aa7109b,5cf35b1..aa7109b
mode 100755,100644..100644
--- a/ext/pdo_mysql/mysql_driver.c
+++ b/ext/pdo_mysql/mysql_driver.c
diff --cc ext/spl/spl_iterators.c
index 7b77cf5,098d7dc..7b77cf5
mode 100755,100644..100644
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
diff --cc main/php_streams.h
index 291fd0d,82498d6..291fd0d
mode 100755,100644..100644
--- a/main/php_streams.h
+++ b/main/php_streams.h
diff --cc main/streams/streams.c
index 81bf594,e9c2e07..81bf594
mode 100755,100644..100644
--- a/main/streams/streams.c
+++ b/main/streams/streams.c


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to