merge master

.travis.yml

@@ -46,7 +46,7 @@ before_deploy:
 deploy:
   provider: releases
   name: FreeType $TRAVIS_TAG
-  body: "This is a release for FreeType $FTB_VERSION, which includes $FTB_ZLIB, $FTB_LIBPNG, $FTB_BZIP2, $FTB_HARFBUZZ. Checksums are in the build logs of the respective os/arch at $TRAVIS_BUILD_WEB_URL (towards the end, in the before_deploy section). There are 3 separate binaries for each os/arch, one with vanilla FreeType, another with FreeType and Harfbuzz and another with FreeType, Harfbuzz and Harfbuzz Subset, pick 1."
+  body: "This is a release for FreeType $FTB_VERSION, which includes $FTB_ZLIB, $FTB_LIBPNG, $FTB_BZIP2, $FTB_HARFBUZZ. Checksums are in the build logs of the respective os/arch at $TRAVIS_BUILD_WEB_URL (towards the end, in the before_deploy section)."
   prerelease: true
   overwrite: false
   skip_cleanup: true

README.md

@@ -8,11 +8,6 @@ Project (www.freetype.org).  All rights reserved.
 The master branch is merely a template, all the code is in the version branches.  
 Builds are run automatically by [TravisCI](https://travis-ci.org/flga/freetype-builds). Headers and binaries are shipped as [Github Releases](https://github.com/flga/freetype-builds/releases).
 
-Every build produces 3 binaries, you should link against *one* of:
-* FreeType
-* FreeType + Harfbuzz
-* FreeType + Harfbuzz + Harfbuzz Subset
-
 ### Support Matrix
 OS | Arch
 ------ | ------