]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Wed, 3 Aug 2016 15:40:38 +0000 (17:40 +0200)
committerAnatol Belski <ab@php.net>
Wed, 3 Aug 2016 15:40:38 +0000 (17:40 +0200)
* PHP-7.0:
  update NEWS
  update NEWS
  Changed the way MAKERNOTE is handled in case we do not have a matching signature (Remi).

1  2 
ext/exif/exif.c

diff --cc ext/exif/exif.c
Simple merge