src/plugins/diffeditor/diffeditor.qbs · 897ea412c32a207bee16bc5a103b512d7c7c2880 · Marco Bubke / flatpak-qt-creator

11 years ago

Merge remote-tracking branch 'origin/2.7' into 2.8 · 8d894aee

Eike Ziller authored 11 years ago

Conflicts:
	src/plugins/analyzerbase/analyzerbase.qbs
	src/plugins/qmljseditor/qmljseditor.qbs
	src/plugins/qt4projectmanager/qt4projectmanager.qbs

Change-Id: If9db8894ed27401a9aa9b385a6117be4c38edd11

8d894aee

History

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

Eike Ziller authored 11 years ago

Conflicts:
	src/plugins/analyzerbase/analyzerbase.qbs
	src/plugins/qmljseditor/qmljseditor.qbs
	src/plugins/qt4projectmanager/qt4projectmanager.qbs

Change-Id: If9db8894ed27401a9aa9b385a6117be4c38edd11