Eike Ziller a503f8bee0 Merge remote-tracking branch 'origin/2.8' ...

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/libs/extensionsystem/pluginmanager.cpp
	src/plugins/coreplugin/documentmanager.cpp
	src/plugins/fakevim/fakevimhandler.cpp

Change-Id: Ibc2adc40bad6f10df94c50d66e78dc3f4bcb84c0

2013-06-05 14:19:43 +02:00

15 KiB

Raw Blame History

View Raw