]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ac71107 1184f0a)
Merge branch 'PHP-7.0'
authorAnatol Belski <ab@php.net>
Thu, 5 Nov 2015 18:51:18 +0000 (19:51 +0100)
committerAnatol Belski <ab@php.net>
Thu, 5 Nov 2015 18:51:18 +0000 (19:51 +0100)
* PHP-7.0:
  add test for bug #70861
  Fix setting of empty string resource.
  fix possible NULL deref in image functions


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.