Files
qt-creator/share/qtcreator
Thomas Hartmann 1f940786fb Merge branch 'qml_renaming'
Conflicts:
	src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
2010-03-01 09:44:00 +01:00
..
2010-03-01 09:44:00 +01:00