con 458a25efa9 Merge remote branch 'origin/2.0' ...

Conflicts:
	doc/qt-html-templates.qdocconf
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmljseditor/qmljscodecompletion.cpp

2010-06-18 16:54:37 +02:00

8.5 KiB

Raw Blame History

View Raw