Files
qt-creator/share/qtcreator/qml/qmlpuppet
Eike Ziller b03a981a41 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/shared/qbs

Change-Id: Ic6f115e3d9da32327cfe2d02d7356687dc3f60d7
2014-02-11 09:14:22 +01:00
..
2014-01-09 09:41:23 +01:00