com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/phar/Makefile.frag
| From: | Remi Collet | Date: | Tue, 02 Jul 2013 08:47:38 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/phar/Makefile.frag | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72563@lists.php.net to get a copy of this message | ||
Commit: 8f0567581e942a56c8e73d4672387a38bcb43eb8
Author: Remi Collet <remi@php.net> Tue, 2 Jul 2013 10:47:38 +0200
Parents: 1968fac697946e813074c68bb9c8d2f916f9bab4 f4ce5e7fb65ce215ea5fd182a90aaa4d634f6023
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8f0567581e942a56c8e73d4672387a38bcb43eb8
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed Bug #65142 Missing phar man page
NEWS
Fixed Bug #65143 Missing php-cgi man page
Bugs:
https://bugs.php.net/65142
https://bugs.php.net/65143
Changed paths:
MM ext/phar/Makefile.frag
Diff: