src/plugins/git/gitplugin.cpp · e31426366bfb9ebefde10df13062c5aa76e3eb00 · Marco Bubke / flatpak-qt-creator

11 years ago

Merge remote-tracking branch 'origin/3.0' · 4eabcdc8

Eike Ziller authored 11 years ago

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/git/gitplugin.cpp
	src/plugins/qt4projectmanager/qmakeproject.cpp

Change-Id: Icbd485214b1add7869233dfe0dd9c6a76bddfc7d

4eabcdc8

History

Merge remote-tracking branch 'origin/3.0'

Eike Ziller authored 11 years ago

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/git/gitplugin.cpp
	src/plugins/qt4projectmanager/qmakeproject.cpp

Change-Id: Icbd485214b1add7869233dfe0dd9c6a76bddfc7d