diff options
| author | Eike Ziller <[email protected]> | 2011-10-17 14:22:32 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2011-10-17 14:22:32 +0200 |
| commit | 8eb8368139b08064bf3340fe1df4ddc74ae6b44d (patch) | |
| tree | 3731efd8103cb1703321eed007574be12475a2ea /src/plugins/qmlprofiler | |
| parent | 4ea9c2193210d2ce87722085aa4ad7cc3057c405 (diff) | |
| parent | a9eb880353ce6b07bab5b57b0663fbe714066907 (diff) | |
Merge remote-tracking branch 'origin/2.4'
Conflicts:
qtcreator.pri
src/libs/qmljs/qmljstypedescriptionreader.cpp
tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp
Change-Id: Id032187023bb42f259a87545ceeb3c965dd01a32
Diffstat (limited to 'src/plugins/qmlprofiler')
0 files changed, 0 insertions, 0 deletions