]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9aed47 fc49f1c)
Merge branch 'master' of git.php.net:/php-src
authorXinchen Hui <laruence@gmail.com>
Thu, 17 Mar 2016 03:57:08 +0000 (11:57 +0800)
committerXinchen Hui <laruence@gmail.com>
Thu, 17 Mar 2016 03:57:08 +0000 (11:57 +0800)
* 'master' of git.php.net:/php-src:
  Fix build
  Fix build
  Fix build
  prepare for 5.6.20RC1
  Fix more emails
  More email fixing
  Fix emails in headers. @mysql.com addresses are no more since many years.
  fix #ifdef usage


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.