-
Oswald Buddenhagen authored
Conflicts: share/qtcreator/static.pro src/plugins/qmljseditor/qmljsoutlinetreeview.cpp src/plugins/projectexplorer/outputwindow.cpp
04d4d309
Conflicts: share/qtcreator/static.pro src/plugins/qmljseditor/qmljsoutlinetreeview.cpp src/plugins/projectexplorer/outputwindow.cpp