com php-src: Merge branch 'PHP-5.5' into PHP-5.6: CODING_STAN DARDS README.SUBMITTING_PATCH
| From: | Stanislav Malyshev | Date: | Mon, 27 Jan 2014 01:21:14 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: CODING_STAN DARDS README.SUBMITTING_PATCH | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75807@lists.php.net to get a copy of this message | ||
Commit: 223a62d69eeace864cb5deb45e3a56eb3ac3beaa
Author: Stanislav Malyshev <stas@php.net> Sun, 26 Jan 2014 17:21:14 -0800
Parents: 561317898c2c531bc9f91c8747cc0458b4c88e97 fed80ee605df24c4fe70f09b77cb2551fdf47d79
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=223a62d69eeace864cb5deb45e3a56eb3ac3beaa
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix English and improve by Stas. Thanks :)
Update source docs
Revert "Update source docs"
Update source docs
Conflicts:
README.EXTENSIONS
Changed paths:
MM CODING_STANDARDS
MM README.SUBMITTING_PATCH
Diff: