diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-06 01:00:08 +0100 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-11-06 19:44:29 +0100 |
commit | 75f791419c54311e1ebf14a0c1651192ab0349f1 (patch) | |
tree | bcdf78298f7978603aec570b4c9ef66e06819fc7 /src/3rdparty/freetype/src/sfnt/Jamfile | |
parent | b274f656b82e06fad492e241dae6ae65cb377ad1 (diff) | |
parent | e3cc16e9fba045b3d195bc0e35dff4735bb6f59c (diff) |
Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"
Diffstat (limited to 'src/3rdparty/freetype/src/sfnt/Jamfile')
-rw-r--r-- | src/3rdparty/freetype/src/sfnt/Jamfile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/3rdparty/freetype/src/sfnt/Jamfile b/src/3rdparty/freetype/src/sfnt/Jamfile index 57977fc966..f646b3526e 100644 --- a/src/3rdparty/freetype/src/sfnt/Jamfile +++ b/src/3rdparty/freetype/src/sfnt/Jamfile @@ -1,6 +1,6 @@ # FreeType 2 src/sfnt Jamfile # -# Copyright 2001-2018 by +# Copyright (C) 2001-2019 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -22,6 +22,8 @@ SubDir FT2_TOP $(FT2_SRC_DIR) sfnt ; sfobjs ttbdf ttcmap + ttcolr + ttcpal ttkern ttload ttmtx |