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

Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp

Change-Id: Ibdf433b54e36e58182b7094f78d47ed3e8c81684

2015-11-12 13:43:17 +01:00

..

qtcreator

Merge remote-tracking branch 'origin/3.6'

2015-11-12 13:43:17 +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