]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 33a3069 1e02e52)
Merge branch 'master' of git.php.net:/php-src
authorXinchen Hui <laruence@gmail.com>
Wed, 3 Aug 2016 04:17:35 +0000 (12:17 +0800)
committerXinchen Hui <laruence@gmail.com>
Wed, 3 Aug 2016 04:17:35 +0000 (12:17 +0800)
commitf451a2358da7ce40891af33af17fa06be6ab48be
tree2df169cfcb2638994ee5fb5e885dd8a2b015e0d5tree | snapshot
parent33a30691b20b1f04bd7a708fa236c8201b2f96ffcommit | diff
parent1e02e528591544c3e85193531038fa7dcaf3c9accommit | diff
Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
  Fixed compiler warning (Sorry Anatol, but this one was killing me)
  Revert "Fixed bug #72735 (Samsung picture thumb not read (zero size))"
  Fixed bug #72735 (Samsung picture thumb not read (zero size))
  Minor touches to the exif build script on Windows; ADD_EXTENSION_DEP() will already ERROR() out, so the WARNING() statement would never be returned anyway.
Unnamed repository; edit this file 'description' to name the repository.