Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Showing
- doc/qtcreator.qdoc 16 additions, 17 deletionsdoc/qtcreator.qdoc
- src/libs/cplusplus/pp-engine.cpp 2 additions, 1 deletionsrc/libs/cplusplus/pp-engine.cpp
- src/plugins/coreplugin/welcomemode.cpp 31 additions, 14 deletionssrc/plugins/coreplugin/welcomemode.cpp
- src/plugins/coreplugin/welcomemode.h 3 additions, 1 deletionsrc/plugins/coreplugin/welcomemode.h
- src/plugins/coreplugin/welcomemode.ui 643 additions, 642 deletionssrc/plugins/coreplugin/welcomemode.ui
- src/plugins/debugger/registerhandler.cpp 2 additions, 4 deletionssrc/plugins/debugger/registerhandler.cpp
- src/plugins/debugger/tcfengine.cpp 83 additions, 32 deletionssrc/plugins/debugger/tcfengine.cpp
- src/plugins/debugger/tcfengine.h 10 additions, 21 deletionssrc/plugins/debugger/tcfengine.h
- src/plugins/duieditor/duidocument.cpp 77 additions, 0 deletionssrc/plugins/duieditor/duidocument.cpp
- src/plugins/duieditor/duidocument.h 66 additions, 0 deletionssrc/plugins/duieditor/duidocument.h
- src/plugins/duieditor/duieditor.cpp 10 additions, 20 deletionssrc/plugins/duieditor/duieditor.cpp
- src/plugins/duieditor/duieditor.pro 4 additions, 2 deletionssrc/plugins/duieditor/duieditor.pro
- tests/manual/preprocessor/main.cpp 59 additions, 19 deletionstests/manual/preprocessor/main.cpp
Loading
Please register or sign in to comment