Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
No related branches found
No related tags found
Showing
- src/libs/3rdparty/botan/src/src.pro 4 additions, 0 deletionssrc/libs/3rdparty/botan/src/src.pro
- src/plugins/cpptools/cppcodecompletion.cpp 1 addition, 1 deletionsrc/plugins/cpptools/cppcodecompletion.cpp
- src/plugins/debugger/gdb/gdbengine.cpp 11 additions, 1 deletionsrc/plugins/debugger/gdb/gdbengine.cpp
- src/plugins/debugger/gdb/trkgdbadapter.cpp 65 additions, 31 deletionssrc/plugins/debugger/gdb/trkgdbadapter.cpp
- src/plugins/help/helpplugin.cpp 20 additions, 17 deletionssrc/plugins/help/helpplugin.cpp
- src/plugins/projectexplorer/buildmanager.cpp 24 additions, 17 deletionssrc/plugins/projectexplorer/buildmanager.cpp
- src/plugins/projectexplorer/buildmanager.h 1 addition, 1 deletionsrc/plugins/projectexplorer/buildmanager.h
- src/plugins/projectexplorer/projectexplorer.cpp 1 addition, 0 deletionssrc/plugins/projectexplorer/projectexplorer.cpp
- src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp 23 additions, 20 deletions...plugins/qmldesigner/core/instances/objectnodeinstance.cpp
- src/plugins/qmldesigner/core/instances/objectnodeinstance.h 1 addition, 0 deletionssrc/plugins/qmldesigner/core/instances/objectnodeinstance.h
- src/plugins/qmleditor/qmleditor.pro 4 additions, 0 deletionssrc/plugins/qmleditor/qmleditor.pro
- src/plugins/qt4projectmanager/makestep.cpp 5 additions, 1 deletionsrc/plugins/qt4projectmanager/makestep.cpp
- src/plugins/qt4projectmanager/qmakestep.cpp 10 additions, 2 deletionssrc/plugins/qt4projectmanager/qmakestep.cpp
- src/plugins/qt4projectmanager/qt4buildconfiguration.cpp 24 additions, 3 deletionssrc/plugins/qt4projectmanager/qt4buildconfiguration.cpp
- src/plugins/qt4projectmanager/qt4buildconfiguration.h 5 additions, 0 deletionssrc/plugins/qt4projectmanager/qt4buildconfiguration.h
- src/plugins/qt4projectmanager/qt4projectmanager.cpp 25 additions, 3 deletionssrc/plugins/qt4projectmanager/qt4projectmanager.cpp
- src/plugins/qt4projectmanager/qt4projectmanager.h 2 additions, 1 deletionsrc/plugins/qt4projectmanager/qt4projectmanager.h
- src/plugins/qt4projectmanager/qt4projectmanagerconstants.h 1 addition, 0 deletionssrc/plugins/qt4projectmanager/qt4projectmanagerconstants.h
- src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp 27 additions, 4 deletionssrc/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
- src/plugins/qt4projectmanager/qt4projectmanagerplugin.h 1 addition, 0 deletionssrc/plugins/qt4projectmanager/qt4projectmanagerplugin.h
Loading
Please register or sign in to comment