]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1968fac f4ce5e7)
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Tue, 2 Jul 2013 08:47:38 +0000 (10:47 +0200)
committerRemi Collet <remi@php.net>
Tue, 2 Jul 2013 08:47:38 +0000 (10:47 +0200)
* PHP-5.4:
  Fixed Bug #65142 Missing phar man page
  NEWS
  Fixed Bug #65143 Missing php-cgi man page

1  2 
ext/phar/Makefile.frag patch | diff1 | diff2 | blob | history

diff --cc ext/phar/Makefile.frag
Simple merge
Unnamed repository; edit this file 'description' to name the repository.