]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Sun, 25 Sep 2016 18:57:30 +0000 (20:57 +0200)
committerAnatol Belski <ab@php.net>
Sun, 25 Sep 2016 18:57:30 +0000 (20:57 +0200)
* PHP-7.0:
  Add an include path for freetype which is relevant for cmake builds


Trivial merge