]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 54daa53 eb7ba73)
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Tue, 4 Aug 2015 23:33:07 +0000 (16:33 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 4 Aug 2015 23:33:07 +0000 (16:33 -0700)
* PHP-5.6:
  virtual_file_ex uses emalloc in 5.6+

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.