]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1f6b940 146b933)
Merge branch 'PHP-5.5'
authorChristopher Jones <sixd@php.net>
Thu, 1 Aug 2013 15:49:19 +0000 (08:49 -0700)
committerChristopher Jones <sixd@php.net>
Thu, 1 Aug 2013 15:49:19 +0000 (08:49 -0700)
* PHP-5.5:
  Revert "Allow 'make distclean' to clean up the 'generated' phar.inc"

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.