diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-22 22:31:51 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-22 22:31:51 +0200 |
| commit | 67934c103800bae50c2ec1977758d40fa8e4e507 (patch) | |
| tree | 77a44eb54a75a35bd10f3c63be588889b697e451 /src/3rdparty/freetype/include/freetype/internal/cffotypes.h | |
| parent | 694575a59b5370afc494fbf700eee8db1d1ec091 (diff) | |
| parent | ca128e25119c0b259d083567c796bfa67b100a42 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-6.2.8' into tqtc/lts-6.2-opensource
Conflicts solved in a file:
src/corelib/io/qstandardpaths_android.cpp
Change-Id: Ie8cef36c1379679ca358df50c56b3c25aa15c5d6
Diffstat (limited to 'src/3rdparty/freetype/include/freetype/internal/cffotypes.h')
| -rw-r--r-- | src/3rdparty/freetype/include/freetype/internal/cffotypes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/freetype/include/freetype/internal/cffotypes.h b/src/3rdparty/freetype/include/freetype/internal/cffotypes.h index 700f586c41..50d5353849 100644 --- a/src/3rdparty/freetype/include/freetype/internal/cffotypes.h +++ b/src/3rdparty/freetype/include/freetype/internal/cffotypes.h @@ -4,7 +4,7 @@ * * Basic OpenType/CFF object type definitions (specification). * - * Copyright (C) 2017-2022 by + * Copyright (C) 2017-2023 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, |