diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-03-26 13:09:43 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-03-26 13:09:43 +0100 |
| commit | 599be01a676cd7990abb3bb25f7ce02565193a89 (patch) | |
| tree | 6dba09d8c7766e3719e266b71556bc52f5220722 /src/plugins/texteditor/snippets/snippeteditor.cpp | |
| parent | ec10e0d79e9cf52b3cac164da5c39accbf4d2b50 (diff) | |
| parent | f409fdd6d3a6aed8b32ded224cf624d52a1ae0fd (diff) | |
| download | qt-creator-599be01a676cd7990abb3bb25f7ce02565193a89.tar.gz | |
Merge remote-tracking branch 'origin/2.7'
Conflicts:
qtcreator.pri
qtcreator.qbs
share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.h
src/plugins/debugger/debuggerplugin.cpp
src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp
src/plugins/qmldesigner/components/debugview/debugview.cpp
src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp
src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h
src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h
src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
src/plugins/qmldesigner/components/navigator/navigatorview.cpp
src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
src/plugins/qmldesigner/designercore/include/abstractview.h
src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h
src/plugins/qmldesigner/designercore/include/rewriterview.h
src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
src/plugins/qmldesigner/designercore/model/abstractview.cpp
src/plugins/qmldesigner/designmodewidget.cpp
Change-Id: I9d8126e88397c02a87b5e4ab4da44e2bc7089134
Diffstat (limited to 'src/plugins/texteditor/snippets/snippeteditor.cpp')
0 files changed, 0 insertions, 0 deletions