Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Showing
- scripts/snapshots/cleanup_snapshots.sh 2 additions, 2 deletionsscripts/snapshots/cleanup_snapshots.sh
- shared/proparser/profileevaluator.cpp 116 additions, 28 deletionsshared/proparser/profileevaluator.cpp
- shared/proparser/proparserutils.h 6 additions, 1 deletionshared/proparser/proparserutils.h
- src/app/Info.plist 2 additions, 2 deletionssrc/app/Info.plist
- src/libs/cplusplus/CppDocument.h 4 additions, 4 deletionssrc/libs/cplusplus/CppDocument.h
- src/libs/cplusplus/TypeOfExpression.cpp 6 additions, 0 deletionssrc/libs/cplusplus/TypeOfExpression.cpp
- src/libs/cplusplus/TypeOfExpression.h 2 additions, 0 deletionssrc/libs/cplusplus/TypeOfExpression.h
- src/plugins/bineditor/BinEditor.pluginspec 3 additions, 3 deletionssrc/plugins/bineditor/BinEditor.pluginspec
- src/plugins/bookmarks/Bookmarks.pluginspec 4 additions, 4 deletionssrc/plugins/bookmarks/Bookmarks.pluginspec
- src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec 6 additions, 6 deletions...lugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
- src/plugins/coreplugin/Core.pluginspec 1 addition, 1 deletionsrc/plugins/coreplugin/Core.pluginspec
- src/plugins/coreplugin/coreconstants.h 1 addition, 1 deletionsrc/plugins/coreplugin/coreconstants.h
- src/plugins/cpaster/CodePaster.pluginspec 4 additions, 4 deletionssrc/plugins/cpaster/CodePaster.pluginspec
- src/plugins/cppeditor/CppEditor.pluginspec 4 additions, 4 deletionssrc/plugins/cppeditor/CppEditor.pluginspec
- src/plugins/cppeditor/cpphoverhandler.cpp 54 additions, 52 deletionssrc/plugins/cppeditor/cpphoverhandler.cpp
- src/plugins/cpptools/CppTools.pluginspec 4 additions, 4 deletionssrc/plugins/cpptools/CppTools.pluginspec
- src/plugins/debugger/Debugger.pluginspec 5 additions, 5 deletionssrc/plugins/debugger/Debugger.pluginspec
- src/plugins/designer/Designer.pluginspec 3 additions, 3 deletionssrc/plugins/designer/Designer.pluginspec
- src/plugins/designer/workbenchintegration.cpp 238 additions, 156 deletionssrc/plugins/designer/workbenchintegration.cpp
- src/plugins/find/Find.pluginspec 2 additions, 2 deletionssrc/plugins/find/Find.pluginspec
Loading
Please register or sign in to comment