diff options
author | Eike Ziller <eike.ziller@qt.io> | 2021-03-11 14:10:14 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2021-03-11 14:10:14 +0100 |
commit | bce64778c5cef8272e9cdedb9be622790bee699a (patch) | |
tree | 95118a96b1ccc27a91a05617e425ec43972f4769 /qtcreator_ide_branding.pri | |
parent | 3560a86c2e436977fab0c36b7dbaa8583bce1712 (diff) | |
parent | e2b05475190e2beabdb7c3f7937e9e44d106aa24 (diff) | |
download | qt-creator-bce64778c5cef8272e9cdedb9be622790bee699a.tar.gz |
Merge remote-tracking branch 'origin/4.15'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qtcreator_ide_branding.pri
Change-Id: I009308451e1c6276692412f498125d79a8f12a07
Diffstat (limited to 'qtcreator_ide_branding.pri')
-rw-r--r-- | qtcreator_ide_branding.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qtcreator_ide_branding.pri b/qtcreator_ide_branding.pri index 65255c343b..5fc13f8964 100644 --- a/qtcreator_ide_branding.pri +++ b/qtcreator_ide_branding.pri @@ -1,7 +1,7 @@ QTCREATOR_VERSION = 4.15.82 QTCREATOR_COMPAT_VERSION = 4.15.82 QTCREATOR_DISPLAY_VERSION = 4.16.0-beta1 -QTCREATOR_COPYRIGHT_YEAR = 2020 +QTCREATOR_COPYRIGHT_YEAR = 2021 IDE_DISPLAY_NAME = Qt Creator IDE_ID = qtcreator |