]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e3dabe4 f15c155)
Merge branch 'PHP-5.6' into PHP-7.0
authorAnatol Belski <ab@php.net>
Wed, 3 Aug 2016 15:39:22 +0000 (17:39 +0200)
committerAnatol Belski <ab@php.net>
Wed, 3 Aug 2016 15:39:22 +0000 (17:39 +0200)
* PHP-5.6:
  update NEWS
  Changed the way MAKERNOTE is handled in case we do not have a matching signature (Remi).

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

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