Skip to content
Find file Blame History Permalink
  • con's avatar
    Merge remote branch 'origin/2.2' · 5b02bf94
    con authored 
    Conflicts:
	qtcreator.pri
	src/plugins/debugger/breakhandler.cpp
	src/plugins/qt4projectmanager/qtversionmanager.cpp
    5b02bf94