diff options
author | Christopher Jones <sixd@php.net> | 2013-08-01 08:49:19 -0700 |
---|---|---|
committer | Christopher Jones <sixd@php.net> | 2013-08-01 08:49:19 -0700 |
commit | 1c91ca990ff673edf8aa521285986759996f0cca (patch) | |
tree | 726298753f90e084c13828e9742a5c4c25a0d776 /ext/phar/dirstream.c | |
parent | 1f6b940dd1b5d43fc2f846a2a85babb342749f05 (diff) | |
parent | 146b933ab49f8068a5fe983bcb5c821e103e575e (diff) | |
download | php-git-1c91ca990ff673edf8aa521285986759996f0cca.tar.gz |
Merge branch 'PHP-5.5'
* PHP-5.5:
Revert "Allow 'make distclean' to clean up the 'generated' phar.inc"
Diffstat (limited to 'ext/phar/dirstream.c')
0 files changed, 0 insertions, 0 deletions