Skip to content
  • con's avatar
    Merge remote branch 'origin/2.1' · b69ab309
    con authored
    Conflicts:
    	share/qtcreator/templates/mobileapp/app.pro
    	share/qtcreator/templates/qmlapp/app.pro
    	src/plugins/debugger/debuggeractions.cpp
    b69ab309