Eike Ziller fa227a4eef Merge remote-tracking branch 'origin/3.6' ...

Conflicts:
	src/libs/qmldebug/qmldebugclient.cpp
	src/libs/qmldebug/qmldebugclient.h
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp

Change-Id: I9594b4e9befc78f8138deb121f0bfc4212f7edbf

2015-11-26 13:01:20 +01:00

..

qtcreator

Merge remote-tracking branch 'origin/3.6'

2015-11-26 13:01:20 +01:00

share.pro

use DISTFILES instead of OTHER_FILES in creator's own build system

2014-09-15 12:10:01 +02:00

share.qbs

Add new ModelEditor plugin.

2015-09-16 12:13:36 +00:00