diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-11-01 18:16:38 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-11-01 18:16:38 +0100 |
| commit | 912cd548c0b0950b3a1e80f2597c99b3bf898c83 (patch) | |
| tree | c9eeb5ac857dcabcfb404f60356ad4522471d9ed /src/plugins/qmldesigner/components/integration/designdocumentcontroller.h | |
| parent | ddde938174f03544182adb79179d192502b50e51 (diff) | |
| parent | 002820867cc0f4f5c67c5ae976eec26157275d4f (diff) | |
| download | qt-creator-912cd548c0b0950b3a1e80f2597c99b3bf898c83.tar.gz | |
Merge remote-tracking branch 'origin/2.4'
Conflicts:
src/libs/qmljs/qmljsinterpreter.cpp
src/libs/qmljs/qmljsinterpreter.h
src/plugins/madde/maemopackagecreationstep.cpp
src/plugins/projectexplorer/buildmanager.cpp
src/plugins/qmljstools/qmljsqtstylecodeformatter.cpp
src/plugins/qmljstools/qmljsqtstylecodeformatter.h
tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp
Change-Id: I63ab2ba5dac006c37ccfbae55b023396a4676ff7
Diffstat (limited to 'src/plugins/qmldesigner/components/integration/designdocumentcontroller.h')
0 files changed, 0 insertions, 0 deletions