diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-01-08 11:01:06 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-01-08 11:01:06 +0100 |
| commit | 236ea9efb912c90cf3ecd6b03006f40e8da4d5f2 (patch) | |
| tree | 5a0d09b49272e510d289483b52f991820d2a37cc /src/plugins/designer/qtcreatorintegration.cpp | |
| parent | 9f46078afea181dda723f15de7f2d7f9fc5c303c (diff) | |
| parent | 746c5d886395f66d3f7af1461555a75300201db6 (diff) | |
| download | qt-creator-236ea9efb912c90cf3ecd6b03006f40e8da4d5f2.tar.gz | |
Merge remote-tracking branch 'origin/3.0'
Conflicts:
share/qtcreator/debugger/dumper.cpp
share/qtcreator/debugger/dumper_p.h
share/qtcreator/debugger/test/main.cpp
src/plugins/debugger/gdb/classicgdbengine.cpp
src/plugins/debugger/gdb/pythongdbengine.cpp
src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
src/plugins/debugger/lldblib/guest/lldbengineguest.h
src/plugins/debugger/lldblib/guest/main.cpp
src/plugins/debugger/lldblib/ipcengineguest.cpp
src/plugins/debugger/lldblib/ipcengineguest.h
src/plugins/debugger/lldblib/ipcenginehost.cpp
src/plugins/debugger/lldblib/ipcenginehost.h
src/plugins/debugger/lldblib/lldbenginehost.cpp
src/plugins/debugger/lldblib/lldboptionspage.cpp
src/plugins/qbsprojectmanager/qbsstep.cpp
src/plugins/qbsprojectmanager/qbsstep.h
src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
src/plugins/qnx/blackberrycheckdevmodestep.cpp
src/plugins/qtsupport/debugginghelper.cpp
Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
Diffstat (limited to 'src/plugins/designer/qtcreatorintegration.cpp')
| -rw-r--r-- | src/plugins/designer/qtcreatorintegration.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp index ef40045b38..8385a77bd2 100644 --- a/src/plugins/designer/qtcreatorintegration.cpp +++ b/src/plugins/designer/qtcreatorintegration.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of Qt Creator. |