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

11 years ago

Eike Ziller authored 11 years ago

Conflicts:
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp

Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104

bedc4779

Eike Ziller authored 11 years ago

Conflicts:
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp

Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104