]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c343ca4 6213d9f)
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Fri, 19 Sep 2014 18:15:56 +0000 (20:15 +0200)
committerAnatol Belski <ab@php.net>
Fri, 19 Sep 2014 18:15:56 +0000 (20:15 +0200)
* PHP-5.6:
  fix possible array underflow

Conflicts:
ext/standard/image.c

1  2 
ext/standard/image.c patch | diff1 | diff2 | blob | history

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