]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.1'
authorXinchen Hui <laruence@gmail.com>
Mon, 10 Apr 2017 03:47:38 +0000 (11:47 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 10 Apr 2017 03:47:38 +0000 (11:47 +0800)
commit2d21404e25174e5f804c897a8e9f289d8e7631b3
tree5a9be52a61c65250f19803272b824dea1a66ab17
parent2b2c6821cdfa9c0d7e6977e4db7a4a0504720613
parentbb5535bd38549b0b1b3bc228ad77bd5d1dfaada4
Merge branch 'PHP-7.1'

* PHP-7.1:
  Update NEWS
  Fixed bug #74379 (syntax error compile error in libmagic/apprentice.c)
  Missed NEWS

Conflicts:
ext/fileinfo/libmagic.patch
ext/fileinfo/libmagic.patch
ext/fileinfo/libmagic/apprentice.c