Eike Ziller f60873a24f Merge remote-tracking branch 'origin/2.7' ...

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ie71d0d5aebdd1406d94de348bcd4cfcc203a1ba9

2013-03-08 11:39:33 +01:00

..

qmldump

Replace com.nokia.qtcreator with org.qt-project.qtcreator

2013-02-07 12:40:37 +01:00

qmljsdebugger

Remove QT_BEGIN/END_HEADER, fixing compilation with Qt 5 (dev).

2013-01-30 18:20:07 +01:00

qmlobserver

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

qmlpuppet

Merge remote-tracking branch 'origin/2.7'

2013-03-08 11:39:33 +01:00