diff options
| author | con <qtc-committer@nokia.com> | 2010-06-18 16:54:37 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-06-18 16:54:37 +0200 |
| commit | 458a25efa9e4c5f1e10f2bc83302b19d535c7775 (patch) | |
| tree | fe44b77d0e92efd0f2aab7d30a401b51177b55b0 /src/plugins/coreplugin/mainwindow.h | |
| parent | 443d5d3dc6c77c7bd544cf3523c8a155dcfc05b0 (diff) | |
| parent | 13bb14dd3cc7f468ce8f63f576fb886d94c04c36 (diff) | |
| download | qt-creator-458a25efa9e4c5f1e10f2bc83302b19d535c7775.tar.gz | |
Merge remote branch 'origin/2.0'
Conflicts:
doc/qt-html-templates.qdocconf
src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
src/plugins/qmljseditor/qmljscodecompletion.cpp
Diffstat (limited to 'src/plugins/coreplugin/mainwindow.h')
0 files changed, 0 insertions, 0 deletions