Skip to content
Find file Blame History Permalink
  • Eike Ziller's avatar
    Merge remote-tracking branch 'origin/3.3' · 56aadc40
    Eike Ziller authored 
    Conflicts:
	src/plugins/debugger/watchhandler.cpp
	src/plugins/projectexplorer/kitmodel.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/shared/qbs

Change-Id: I6a68090993a264e93ac7850858cc24ba6bdb5602
    56aadc40