]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorJoe Watkins <krakjoe@php.net>
Sun, 22 Jan 2017 06:41:20 +0000 (06:41 +0000)
committerJoe Watkins <krakjoe@php.net>
Sun, 22 Jan 2017 06:41:20 +0000 (06:41 +0000)
* PHP-7.1:
  Fix intermittent segfault in GD library

1  2 
ext/gd/gd_ctx.c

diff --cc ext/gd/gd_ctx.c
Simple merge