-
con authored
Conflicts: src/plugins/projectexplorer/gcctoolchain.cpp src/plugins/projectexplorer/target.cpp src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
14487af8
Conflicts: src/plugins/projectexplorer/gcctoolchain.cpp src/plugins/projectexplorer/target.cpp src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp