diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-18 01:00:27 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-18 01:00:28 +0200 |
commit | c8625a3e67b23b346c4f64c22ac8cfca362e1211 (patch) | |
tree | 0fd53832cae84863c5fa0926782658a89a8dd996 /header.GPL-EXCEPT | |
parent | 436faee8b3704f9aae5620bc69f14c3461fc208c (diff) | |
parent | 2b5587d901a0cc23749bf27a923d50bf0e5860d3 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I86f04fc3b2e4291f161a4985adddd6fd6c789d33
Diffstat (limited to 'header.GPL-EXCEPT')
-rw-r--r-- | header.GPL-EXCEPT | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/header.GPL-EXCEPT b/header.GPL-EXCEPT index 26ed5a245a..4a6bb4cc00 100644 --- a/header.GPL-EXCEPT +++ b/header.GPL-EXCEPT @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) YYYY The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the FOO module of the Qt Toolkit. |