diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-10-22 08:40:59 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-10-22 08:40:59 +0200 |
| commit | 4eabcdc8fdd226eb9195b7ca3a303e052c90277c (patch) | |
| tree | f3d4970c9b285a764d54b012aab6e7307a0fe93b /src/plugins/qnx/qnxdeviceconfigurationwizardpages.cpp | |
| parent | b8c3a79705c6504b1aeb20476794c4f1b537ec01 (diff) | |
| parent | 10f42df8b3532ae71fd7d405e28614f81bcf40e7 (diff) | |
| download | qt-creator-4eabcdc8fdd226eb9195b7ca3a303e052c90277c.tar.gz | |
Merge remote-tracking branch 'origin/3.0'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/git/gitplugin.cpp
src/plugins/qt4projectmanager/qmakeproject.cpp
Change-Id: Icbd485214b1add7869233dfe0dd9c6a76bddfc7d
Diffstat (limited to 'src/plugins/qnx/qnxdeviceconfigurationwizardpages.cpp')
| -rw-r--r-- | src/plugins/qnx/qnxdeviceconfigurationwizardpages.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qnx/qnxdeviceconfigurationwizardpages.cpp b/src/plugins/qnx/qnxdeviceconfigurationwizardpages.cpp index eccfc8edf4..0aa545fa2d 100644 --- a/src/plugins/qnx/qnxdeviceconfigurationwizardpages.cpp +++ b/src/plugins/qnx/qnxdeviceconfigurationwizardpages.cpp @@ -1,8 +1,8 @@ /************************************************************************** ** -** Copyright (C) 2011 - 2013 Research In Motion +** Copyright (C) 2012, 2013 BlackBerry Limited. All rights reserved. ** -** Contact: Research In Motion (blackberry-qt@qnx.com) +** Contact: BlackBerry (qt@blackberry.com) ** Contact: KDAB (info@kdab.com) ** ** This file is part of Qt Creator. |