Files
qt-creator/scripts
Eike Ziller bedc477943 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp

Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104
2013-04-30 11:43:33 +02:00
..
2013-02-27 09:52:41 +01:00
2012-10-05 11:49:06 +02:00