]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Tue, 31 Oct 2017 12:35:14 +0000 (15:35 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 31 Oct 2017 12:35:14 +0000 (15:35 +0300)
* 'master' of git.php.net:php-src:
  Fix year
  Add /nologo
  These functions are always available, exif can't be cross version compiled anyway


Trivial merge