Merge remote branch 'origin/2.0'
Conflicts: doc/qt-html-templates.qdocconf src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp src/plugins/qmljseditor/qmljscodecompletion.cpp
dist/changes-2.1.0
0 → 100644

| W: | H:
| W: | H:


826 Bytes
25.7 KB
177 Bytes
114 Bytes
3.03 KB
1.99 KB