From: Anatol Belski <ab@php.net>
Date: Sun, 25 Sep 2016 18:58:09 +0000 (+0200)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~1232^2~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56ff6139741975aee021cd0e7fb0b3895ffe117a;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  Add an include path for freetype which is relevant for cmake builds
---

56ff6139741975aee021cd0e7fb0b3895ffe117a