Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
No related branches found
No related tags found
Showing
- doc/qtcreator.qdoc 4 additions, 4 deletionsdoc/qtcreator.qdoc
- doc/qtcreator.qdocconf 6 additions, 6 deletionsdoc/qtcreator.qdocconf
- share/qtcreator/Info.plist 2 additions, 2 deletionsshare/qtcreator/Info.plist
- src/libs/cplusplus/CppDocument.cpp 27 additions, 2 deletionssrc/libs/cplusplus/CppDocument.cpp
- src/libs/cplusplus/CppDocument.h 23 additions, 5 deletionssrc/libs/cplusplus/CppDocument.h
- src/libs/cplusplus/PreprocessorClient.h 21 additions, 2 deletionssrc/libs/cplusplus/PreprocessorClient.h
- src/libs/cplusplus/pp-engine.cpp 51 additions, 13 deletionssrc/libs/cplusplus/pp-engine.cpp
- src/libs/cplusplus/pp-engine.h 4 additions, 2 deletionssrc/libs/cplusplus/pp-engine.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/coreplugin/editormanager/openeditorsview.cpp 2 additions, 2 deletionssrc/plugins/coreplugin/editormanager/openeditorsview.cpp
- 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/cpptools/CppTools.pluginspec 4 additions, 4 deletionssrc/plugins/cpptools/CppTools.pluginspec
- src/plugins/cpptools/cppmodelmanager.cpp 6 additions, 4 deletionssrc/plugins/cpptools/cppmodelmanager.cpp
- 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
Loading
Please register or sign in to comment