com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/phar/phar/pharcommand.inc ext/spl/examples/dbaarray.inc ext/spl/internal/regexiterator.inc
| From: | Xinchen Hui | Date: | Wed, 10 Oct 2012 02:45:07 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/phar/phar/pharcommand.inc ext/spl/examples/dbaarray.inc ext/spl/internal/regexiterator.inc | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70326@lists.php.net to get a copy of this message | ||
Commit: 69a4301f6c235fb4535bdd31a9de5f730f07574d
Author: Xinchen Hui <laruence@php.net> Wed, 10 Oct 2012 10:45:07 +0800
Parents: 45e938ec343ba566a3effd7a2247a00a08f683cd 1b9e0de2ccab0d6ae6f77b53b5c3a306ec154496
Branches: PHP-5.4
Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=69a4301f6c235fb4535bdd31a9de5f730f07574d
Log:
Merge branch 'PHP-5.3' into PHP-5.4
Changed paths:
MM ext/phar/phar/pharcommand.inc
MM ext/spl/examples/dbaarray.inc
MM ext/spl/internal/regexiterator.inc
Diff:
diff --cc ext/phar/phar/pharcommand.inc
index cb34367,9e96869..cb34367
mode 100755,100644..100644
--- a/ext/phar/phar/pharcommand.inc
+++ b/ext/phar/phar/pharcommand.inc
diff --cc ext/spl/examples/dbaarray.inc
index d448ad7,fcd6bb3..d448ad7
mode 100755,100644..100644
--- a/ext/spl/examples/dbaarray.inc
+++ b/ext/spl/examples/dbaarray.inc
diff --cc ext/spl/internal/regexiterator.inc
index c6addb9,96b8f81..c6addb9
mode 100755,100644..100644
--- a/ext/spl/internal/regexiterator.inc
+++ b/ext/spl/internal/regexiterator.inc