Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Showing
- src/libs/cplusplus/CppDocument.cpp 1 addition, 0 deletionssrc/libs/cplusplus/CppDocument.cpp
- src/libs/cplusplus/SimpleLexer.cpp 3 additions, 1 deletionsrc/libs/cplusplus/SimpleLexer.cpp
- src/libs/cplusplus/pp-engine.cpp 3 additions, 0 deletionssrc/libs/cplusplus/pp-engine.cpp
- src/libs/cplusplus/pp-engine.h 1 addition, 0 deletionssrc/libs/cplusplus/pp-engine.h
- src/plugins/bineditor/BinEditor.mimetypes.xml 0 additions, 33 deletionssrc/plugins/bineditor/BinEditor.mimetypes.xml
- src/plugins/cppeditor/CppEditor.mimetypes.xml 11 additions, 91 deletionssrc/plugins/cppeditor/CppEditor.mimetypes.xml
- src/plugins/cppeditor/cpphighlighter.cpp 2 additions, 0 deletionssrc/plugins/cppeditor/cpphighlighter.cpp
- src/plugins/cpptools/completionsettingspage.ui 10 additions, 1 deletionsrc/plugins/cpptools/completionsettingspage.ui
- src/plugins/designer/Designer.mimetypes.xml 0 additions, 29 deletionssrc/plugins/designer/Designer.mimetypes.xml
- src/plugins/qtscripteditor/QtScriptEditor.mimetypes.xml 0 additions, 31 deletionssrc/plugins/qtscripteditor/QtScriptEditor.mimetypes.xml
- src/plugins/texteditor/TextEditor.mimetypes.xml 0 additions, 30 deletionssrc/plugins/texteditor/TextEditor.mimetypes.xml
- src/plugins/texteditor/behaviorsettingspage.ui 135 additions, 120 deletionssrc/plugins/texteditor/behaviorsettingspage.ui
- src/plugins/texteditor/displaysettingspage.ui 77 additions, 52 deletionssrc/plugins/texteditor/displaysettingspage.ui
- src/plugins/texteditor/fontsettingspage.ui 2 additions, 2 deletionssrc/plugins/texteditor/fontsettingspage.ui
- src/plugins/vcsbase/VCSBase.mimetypes.xml 0 additions, 31 deletionssrc/plugins/vcsbase/VCSBase.mimetypes.xml
- src/shared/cplusplus/AST.cpp 4 additions, 10 deletionssrc/shared/cplusplus/AST.cpp
- src/shared/cplusplus/AST.h 3 additions, 1 deletionsrc/shared/cplusplus/AST.h
- src/shared/cplusplus/ObjectiveCTypeQualifiers.cpp 124 additions, 0 deletionssrc/shared/cplusplus/ObjectiveCTypeQualifiers.cpp
- src/shared/cplusplus/ObjectiveCTypeQualifiers.h 56 additions, 0 deletionssrc/shared/cplusplus/ObjectiveCTypeQualifiers.h
- src/shared/cplusplus/Parser.cpp 274 additions, 20 deletionssrc/shared/cplusplus/Parser.cpp
Loading
Please register or sign in to comment