]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 76d0e3d 0e3dede)
Merge branch 'master' of git.php.net:/php-src
authorXinchen Hui <laruence@gmail.com>
Thu, 4 Jan 2018 05:45:11 +0000 (13:45 +0800)
committerXinchen Hui <laruence@gmail.com>
Thu, 4 Jan 2018 05:45:11 +0000 (13:45 +0800)
* 'master' of git.php.net:/php-src:
  Happy new year (Update copyright to 2018)
  Happy new year (Update copyright to 2018)
  Revert "Enable ODBC tests on AppVeyor"
  Enable ODBC tests on AppVeyor
  Skip on Travis-CI
  Extend skip section
  2018
  missing changelog entries + fix version and date
  missing changelog entries
  2018
  Trailing whitespaces

1  2 
Zend/zend_compile.c patch | diff1 | diff2 | blob | history

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