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

13 files changed, 13 insertions, 13 deletions

diff --git a/tests/manual/debugger/boost/main.cpp b/tests/manual/debugger/boost/main.cpp
index cfb2744096..8e99546ac1 100644
--- a/tests/manual/debugger/boost/main.cpp
+++ b/tests/manual/debugger/boost/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of Qt Creator.
diff --git a/tests/manual/debugger/gui/mainwindow.cpp b/tests/manual/debugger/gui/mainwindow.cpp
index c5353d1691..afe398774e 100644
--- a/tests/manual/debugger/gui/mainwindow.cpp
+++ b/tests/manual/debugger/gui/mainwindow.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of Qt Creator.
diff --git a/tests/manual/debugger/gui/mainwindow.h b/tests/manual/debugger/gui/mainwindow.h
index d8a67f1112..5157f67de9 100644
--- a/tests/manual/debugger/gui/mainwindow.h
+++ b/tests/manual/debugger/gui/mainwindow.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of Qt Creator.
diff --git a/tests/manual/debugger/gui/tst_gui.cpp b/tests/manual/debugger/gui/tst_gui.cpp
index 4998947af1..dcaacbd3ae 100644
--- a/tests/manual/debugger/gui/tst_gui.cpp
+++ b/tests/manual/debugger/gui/tst_gui.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of Qt Creator.
diff --git a/tests/manual/debugger/helper/main.cpp b/tests/manual/debugger/helper/main.cpp
index cc71d5c837..01f82fc7ed 100644
--- a/tests/manual/debugger/helper/main.cpp
+++ b/tests/manual/debugger/helper/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of Qt Creator.
diff --git a/tests/manual/debugger/script/math.js b/tests/manual/debugger/script/math.js
index 2b10d0bcce..1fd46674c4 100644
--- a/tests/manual/debugger/script/math.js
+++ b/tests/manual/debugger/script/math.js
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of Qt Creator.
diff --git a/tests/manual/debugger/simple/deep/deep/simple_test_app.h b/tests/manual/debugger/simple/deep/deep/simple_test_app.h
index 376bc4cb73..820fe560c7 100644
--- a/tests/manual/debugger/simple/deep/deep/simple_test_app.h
+++ b/tests/manual/debugger/simple/deep/deep/simple_test_app.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of Qt Creator.
diff --git a/tests/manual/debugger/simple/simple_test_app.cpp b/tests/manual/debugger/simple/simple_test_app.cpp
index 27fe45a14f..8a8c18a394 100644
--- a/tests/manual/debugger/simple/simple_test_app.cpp
+++ b/tests/manual/debugger/simple/simple_test_app.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of Qt Creator.
diff --git a/tests/manual/debugger/simple/simple_test_plugin.cpp b/tests/manual/debugger/simple/simple_test_plugin.cpp
index a3e313863d..e032a42e5e 100644
--- a/tests/manual/debugger/simple/simple_test_plugin.cpp
+++ b/tests/manual/debugger/simple/simple_test_plugin.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of Qt Creator.
diff --git a/tests/manual/debugger/spacy path/app with space.cpp b/tests/manual/debugger/spacy path/app with space.cpp
index e05f997ba7..d5291c31cd 100644
--- a/tests/manual/debugger/spacy path/app with space.cpp
+++ b/tests/manual/debugger/spacy path/app with space.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of Qt Creator.
diff --git a/tests/manual/debugger/spacy path/plugin with space.cpp b/tests/manual/debugger/spacy path/plugin with space.cpp
index 7d1b8dddb1..b77366d8bf 100644
--- a/tests/manual/debugger/spacy path/plugin with space.cpp
+++ b/tests/manual/debugger/spacy path/plugin with space.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of Qt Creator.
diff --git a/tests/manual/debugger/spacy-file/app with space.cpp b/tests/manual/debugger/spacy-file/app with space.cpp
index e05f997ba7..d5291c31cd 100644
--- a/tests/manual/debugger/spacy-file/app with space.cpp
+++ b/tests/manual/debugger/spacy-file/app with space.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of Qt Creator.
diff --git a/tests/manual/debugger/spacy-file/plugin with space.cpp b/tests/manual/debugger/spacy-file/plugin with space.cpp
index 7d1b8dddb1..b77366d8bf 100644
--- a/tests/manual/debugger/spacy-file/plugin with space.cpp
+++ b/tests/manual/debugger/spacy-file/plugin with space.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of Qt Creator.