Eike Ziller a98fe15fe5 Merge remote-tracking branch 'origin/2.8' into HEAD ...

Conflicts:
	qbs/pluginspec/pluginspec.qbs

Change-Id: Ic8e992623b9eda8913ee473c779a8df27643ccc9

2013-07-08 15:01:17 +02:00

..

qmldump

Revert "Fixing Info.plist.in for qmlobserver and qmldump"

2013-06-28 14:22:45 +02:00

qmljsdebugger

Fix Krazy warnings about improper include guard in QML debugger.

2013-03-15 13:23:17 +01:00

qmlobserver

Revert "Fixing Info.plist.in for qmlobserver and qmldump"

2013-06-28 14:22:45 +02:00

qmlpuppet

Merge remote-tracking branch 'origin/2.8' into HEAD

2013-07-08 15:01:17 +02:00