]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a24aefa 6480725)
Merge branch 'PHP-5.5' into PHP-5.6
authorMichael Wallner <mike@php.net>
Mon, 30 Mar 2015 14:25:47 +0000 (16:25 +0200)
committerMichael Wallner <mike@php.net>
Mon, 30 Mar 2015 14:25:47 +0000 (16:25 +0200)
* PHP-5.5:
  Fixed bug #64931

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.