diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-03-11 14:00:57 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-03-11 14:00:57 +0100 |
| commit | e2b05475190e2beabdb7c3f7937e9e44d106aa24 (patch) | |
| tree | b8d36558d8a400b4cc14756b42a3931da9cedfbf /qtcreator_ide_branding.pri | |
| parent | 8f68cb9e75bb866aded211edd104bde00b64218e (diff) | |
| parent | e2112d68310965488e5640f810669580eb9ee57f (diff) | |
| download | qt-creator-e2b05475190e2beabdb7c3f7937e9e44d106aa24.tar.gz | |
Merge remote-tracking branch 'origin/4.14' into 4.15
Conflicts:
qtcreator_ide_branding.pri
Change-Id: I9d9beb7b842800ac37bc628695fb01dc91923eb9
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 41950b9746..ca4794bd1a 100644 --- a/qtcreator_ide_branding.pri +++ b/qtcreator_ide_branding.pri @@ -1,7 +1,7 @@ QTCREATOR_VERSION = 4.14.82 QTCREATOR_COMPAT_VERSION = 4.14.82 QTCREATOR_DISPLAY_VERSION = 4.15.0-beta1 -QTCREATOR_COPYRIGHT_YEAR = 2020 +QTCREATOR_COPYRIGHT_YEAR = 2021 IDE_DISPLAY_NAME = Qt Creator IDE_ID = qtcreator |