diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-02-13 09:37:39 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-02-13 09:37:39 +0100 |
| commit | a8dfba176bd75587cedbbbfe92669b13aad7a38a (patch) | |
| tree | c7eabde4b5b3f514ba4df14ec79a43a254a591cc /plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp | |
| parent | 19476fb70e009aed5a345eb716203b81011a0fc7 (diff) | |
| parent | c98db856f9958460acbe20b1e3804f15d4a29132 (diff) | |
| download | qt-creator-a8dfba176bd75587cedbbbfe92669b13aad7a38a.tar.gz | |
Merge remote-tracking branch 'origin/3.3'
Conflicts:
plugins/clangstaticanalyzer/ClangStaticAnalyzer.json.in
Change-Id: Iffa578b015c51375cdb2d9930830cb2d76433bc7
Diffstat (limited to 'plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp')
| -rw-r--r-- | plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp index e027d24907..15deb7b9ce 100644 --- a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp +++ b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp @@ -1,18 +1,18 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc +** Copyright (C) 2015 The Qt Company Ltd ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com <http://qt.digia.com/> +** For any questions to The Qt Company, please use contact form at http://www.qt.io/contact-us ** ** This file is part of the Qt Enterprise LicenseChecker Add-on. ** ** Licensees holding valid Qt Enterprise licenses may use this file in ** accordance with the Qt Enterprise License Agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** a written agreement between you and The Qt Company. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com <http://qt.digia.com/> +** contact form at http://www.qt.io/contact-us ** ****************************************************************************/ |