aboutsummaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-01-31 16:25:33 +0100
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-01-31 16:25:33 +0100
commit1fda2111d468a08b72894e0dbc63dfec46f97ab8 (patch)
tree79580a2a7bb72a0b0c5dd0afb2c7b3c0eec8bdbb /README
parent893b3da55d998fb76322768e890d29c46fd6b33d (diff)
parentc0fe6211277b83e8ea26a9cf6f193836f41ab462 (diff)
Merge remote-tracking branch 'origin/2.6'
Conflicts: src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp src/plugins/qmldesigner/designercore/include/widgetqueryview.h src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qnx/bardescriptormagicmatcher.h src/plugins/qt4projectmanager/profilekeywords.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
Diffstat (limited to 'README')
-rw-r--r--README4
1 files changed, 2 insertions, 2 deletions
diff --git a/README b/README
index 090a2e3ba7..f93fe62fe3 100644
--- a/README
+++ b/README
@@ -255,10 +255,10 @@ we thank the authors who made this possible:
* ClassView and ImageViewer plugins
- Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+ Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
All rights reserved.
- Copyright (c) 2010 Denis Mingulov.
+ Copyright (c) 2013 Denis Mingulov.
Contact: http://www.qt-project.org/