diff options
| author | Eike Ziller <[email protected]> | 2011-11-25 09:48:25 +0100 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2011-11-25 09:48:25 +0100 |
| commit | e2b0835b58aefdab91edda097c1180dae08058f6 (patch) | |
| tree | 5c26a165c4956d87b3d9cc5568b590276541f5e0 /src/libs/qmljs/qmljsvalueowner.h | |
| parent | 84aa93c2bbdd4b9e9bb84df78261abd343c07471 (diff) | |
| parent | 7ff81c435af06179fd64147a72f55e884e299cef (diff) | |
Merge remote-tracking branch 'origin/2.4'
Conflicts:
qtcreator.pri
src/libs/qmljs/qmljstypedescriptionreader.cpp
src/plugins/analyzerbase/startremotedialog.ui
src/plugins/qmldesigner/designercore/include/rewriterview.h
src/plugins/qt4projectmanager/makestep.cpp
Change-Id: If9d15a8c8f73106585fd8ce6ac47c253a40af6b1
Diffstat (limited to 'src/libs/qmljs/qmljsvalueowner.h')
0 files changed, 0 insertions, 0 deletions