src/plugins/git/giteditor.cpp · 921bf4b8613c6035e91d66eec6dfe5a5825972cd · Marco Bubke / flatpak-qt-creator

11 years ago

Merge remote-tracking branch 'origin/3.1' · 868428cc

Oswald Buddenhagen authored 11 years ago

Conflicts:
	qbs/imports/QtcTool.qbs
	src/plugins/git/giteditor.cpp
	src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0

868428cc

History

Merge remote-tracking branch 'origin/3.1'

Oswald Buddenhagen authored 11 years ago

Conflicts:
	qbs/imports/QtcTool.qbs
	src/plugins/git/giteditor.cpp
	src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0