src/plugins/git/mergetool.cpp · 7debb350cf2d43ecf1d3b6c8d592912ab599b770 · Marco Bubke / flatpak-qt-creator

"README.md" did not exist on "75bcf2bc663b754b795992846a1db92f99480db4"

12 years ago

Merge remote-tracking branch 'origin/2.7' · 65654e4a

Eike Ziller authored 12 years ago

Conflicts:
	src/plugins/android/androidrunner.cpp
	src/plugins/clearcase/clearcasesync.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	tests/auto/ioutils/ioutils.pro

Change-Id: I31587b8a4dd6aacc1e76803159da51a972878370

65654e4a

History

Merge remote-tracking branch 'origin/2.7'

Eike Ziller authored 12 years ago

Conflicts:
	src/plugins/android/androidrunner.cpp
	src/plugins/clearcase/clearcasesync.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	tests/auto/ioutils/ioutils.pro

Change-Id: I31587b8a4dd6aacc1e76803159da51a972878370