Merge branch 'origin/1.3' (early part)
Conflicts: src/plugins/debugger/gdb/trkgdbadapter.cpp src/plugins/projectexplorer/projectexplorer.cpp src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp src/plugins/texteditor/basetexteditor.cpp
This diff is collapsed.
This diff is collapsed.
Please register or sign in to comment