]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ece7421 b99862e)
Merge branch 'PHP-5.5' into PHP-5.6
authorFelipe Pena <felipensp@gmail.com>
Sun, 11 May 2014 12:46:38 +0000 (09:46 -0300)
committerFelipe Pena <felipensp@gmail.com>
Sun, 11 May 2014 12:46:38 +0000 (09:46 -0300)
* PHP-5.5:
  - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)

1  2 
ext/phar/phar_object.c patch | diff1 | diff2 | blob | history

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