Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Showing
- doc/api/qtcreator-api.qdoc 34 additions, 17 deletionsdoc/api/qtcreator-api.qdoc
- doc/api/qtcreator-api.qdocconf 4 additions, 2 deletionsdoc/api/qtcreator-api.qdocconf
- src/libs/aggregation/aggregate.cpp 3 additions, 3 deletionssrc/libs/aggregation/aggregate.cpp
- src/libs/extensionsystem/iplugin.cpp 1 addition, 0 deletionssrc/libs/extensionsystem/iplugin.cpp
- src/plugins/find/currentdocumentfind.cpp 3 additions, 1 deletionsrc/plugins/find/currentdocumentfind.cpp
- src/plugins/qt4projectmanager/qt4project.cpp 0 additions, 1 deletionsrc/plugins/qt4projectmanager/qt4project.cpp
- tests/manual/cplusplus/main.cpp 58 additions, 8 deletionstests/manual/cplusplus/main.cpp
Loading
Please register or sign in to comment