]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c91ca9 d884ec1)
Merge branch 'PHP-5.5'
authorChristopher Jones <sixd@php.net>
Thu, 1 Aug 2013 16:22:47 +0000 (09:22 -0700)
committerChristopher Jones <sixd@php.net>
Thu, 1 Aug 2013 16:22:47 +0000 (09:22 -0700)
* PHP-5.5:
  Clean up the 'generated' phar.inc file. When building outside the source tree the copied phar.inc needs to be removed, but when building in the tree, the file must remain since it is part of the source. See the copying logic in ext/phar/Makefile.frag.

1  2 
Makefile.global patch | diff1 | diff2 | blob | history

diff --cc Makefile.global
Simple merge
Unnamed repository; edit this file 'description' to name the repository.