src/plugins/git/branchmodel.cpp · 745f82bfc68cc8b9ac3e12c0147f298fc16dc523 · Marco Bubke / flatpak-qt-creator

11 years ago

Eike Ziller authored 11 years ago

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I37e550646f877b50693043894976a693ac22ad5e

ab0c3da0

Eike Ziller authored 11 years ago

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I37e550646f877b50693043894976a693ac22ad5e