diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-02-07 10:41:09 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-02-07 10:41:09 +0100 |
| commit | 0795a5ae6fabff901f53912040673b1d149d6821 (patch) | |
| tree | c5a124fdff36863f5616deb57354cfb3a7af9e46 /qtcreator_ide_branding.pri | |
| parent | 11c242427caa71eefde2fd2ffe9f108a6e52fbca (diff) | |
| parent | ee579b5bf3fc1407685afb78404baa593d2fc6f7 (diff) | |
| download | qt-creator-0795a5ae6fabff901f53912040673b1d149d6821.tar.gz | |
Merge remote-tracking branch 'origin/4.11'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
Change-Id: I4e339410b17df4098f17e3bb621e1c02e3f8026b
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 90031cc7c9..4f7aa7c39c 100644 --- a/qtcreator_ide_branding.pri +++ b/qtcreator_ide_branding.pri @@ -1,7 +1,7 @@ QTCREATOR_VERSION = 4.11.82 QTCREATOR_COMPAT_VERSION = 4.11.82 QTCREATOR_DISPLAY_VERSION = 4.12.0-beta1 -QTCREATOR_COPYRIGHT_YEAR = 2019 +QTCREATOR_COPYRIGHT_YEAR = 2020 BINARY_ARTIFACTS_BRANCH = master IDE_DISPLAY_NAME = Qt Creator |