Skip to content
Find file Blame History Permalink
  • Eike Ziller's avatar
    Merge remote-tracking branch 'origin/2.7' · 65654e4a
    Eike Ziller authored 
    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