Skip to content
  • Oswald Buddenhagen's avatar
    Merge remote-tracking branch 'origin/2.5' · 82223362
    Oswald Buddenhagen authored
    Conflicts:
    	qtcreator.pri
    	src/libs/utils/utils.qbs
    	src/plugins/projectexplorer/miniprojecttargetselector.cpp
    	src/plugins/qmljseditor/qmljseditor.qbs
    	src/plugins/qmljsinspector/qmljsinspector.qbs
    
    Change-Id: Ib239d50c21cb06d3a8e821e03dc093552f40ffab
    82223362