-
Oswald Buddenhagen authoredConflicts: share/qtcreator/static.pro src/plugins/qmljseditor/qmljsoutlinetreeview.cpp src/plugins/projectexplorer/outputwindow.cppOswald Buddenhagen authoredConflicts: share/qtcreator/static.pro src/plugins/qmljseditor/qmljsoutlinetreeview.cpp src/plugins/projectexplorer/outputwindow.cpp