Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Showing
- share/share.pri 4 additions, 3 deletionsshare/share.pri
- src/plugins/coreplugin/progressmanager/progressview.cpp 1 addition, 0 deletionssrc/plugins/coreplugin/progressmanager/progressview.cpp
- src/plugins/help/centralwidget.cpp 50 additions, 14 deletionssrc/plugins/help/centralwidget.cpp
- src/plugins/projectexplorer/projectexplorer.cpp 4 additions, 4 deletionssrc/plugins/projectexplorer/projectexplorer.cpp
- src/plugins/qt4projectmanager/qmakestep.cpp 1 addition, 0 deletionssrc/plugins/qt4projectmanager/qmakestep.cpp
- src/plugins/qt4projectmanager/qt4runconfiguration.cpp 91 additions, 20 deletionssrc/plugins/qt4projectmanager/qt4runconfiguration.cpp
- src/plugins/qt4projectmanager/qt4runconfiguration.h 42 additions, 0 deletionssrc/plugins/qt4projectmanager/qt4runconfiguration.h
- src/shared/qrceditor/qrceditor.cpp 7 additions, 0 deletionssrc/shared/qrceditor/qrceditor.cpp
Loading
Please register or sign in to comment