com php-src: Merge branch 'PHP-5.5' into PHP-5.6: php.ini-development php.ini-production
| From: | Yasuo Ohgaki | Date: | Mon, 27 Jan 2014 09:57:45 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: php.ini-development php.ini-production | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75815@lists.php.net to get a copy of this message | ||
Commit: a63c0950330997361a082bd35c9e62a70417ec66
Author: Yasuo Ohgaki <yohgaki@php.net> Mon, 27 Jan 2014 18:57:45 +0900
Parents: 223a62d69eeace864cb5deb45e3a56eb3ac3beaa de99fd7301421f515e545bd20a4b226715e16a41
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a63c0950330997361a082bd35c9e62a70417ec66
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Remove obsolete description
Conflicts:
php.ini-development
php.ini-production
Changed paths:
MM php.ini-development
MM php.ini-production
Diff: