diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-10-05 21:20:50 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-10-05 21:20:50 +0200 |
| commit | 6fd252b0a59fd003a533ec786252f4806081804b (patch) | |
| tree | 862771f0d66b689a2d202815ad8779984f5fb739 /src/plugins/remotelinux/RemoteLinux.pluginspec.in | |
| parent | cfdac3c8068363186a91936b50c68e344f58d5f2 (diff) | |
| parent | 6c15f14bab0e27df99b333fc2321b1266c67dd1c (diff) | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
src/plugins/debugger/qtmessageloghandler.cpp
src/plugins/debugger/qtmessageloghandler.h
src/plugins/debugger/qtmessagelogwindow.cpp
src/plugins/madde/maemodeployconfigurationwidget.cpp
src/plugins/madde/maemodeployconfigurationwidget.h
src/plugins/remotelinux/deployablefilesperprofile.cpp
src/plugins/remotelinux/deployablefilesperprofile.h
src/plugins/remotelinux/deploymentinfo.cpp
src/plugins/remotelinux/deploymentinfo.h
src/plugins/remotelinux/deploymentsettingsassistant.cpp
src/plugins/remotelinux/profilesupdatedialog.cpp
src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
tests/auto/icheckbuild/ichecklib.cpp
tests/auto/icheckbuild/ichecklib_global.h
tests/auto/icheckbuild/parsemanager.cpp
tests/auto/icheckbuild/parsemanager.h
tests/manual/ssh/tunnel/tunnel.h
Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
Diffstat (limited to 'src/plugins/remotelinux/RemoteLinux.pluginspec.in')
| -rw-r--r-- | src/plugins/remotelinux/RemoteLinux.pluginspec.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/remotelinux/RemoteLinux.pluginspec.in b/src/plugins/remotelinux/RemoteLinux.pluginspec.in index 84270a6269..b0c21e145f 100644 --- a/src/plugins/remotelinux/RemoteLinux.pluginspec.in +++ b/src/plugins/remotelinux/RemoteLinux.pluginspec.in @@ -1,10 +1,10 @@ <plugin name=\"RemoteLinux\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\"> - <vendor>Nokia Corporation</vendor> - <copyright>(C) 2012 Nokia Corporation</copyright> + <vendor>Digia Plc</vendor> + <copyright>(C) 2012 Digia Plc</copyright> <license> Commercial Usage -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Nokia. +Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. GNU Lesser General Public License Usage |