Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline
No related branches found
No related tags found
Showing
- src/libs/qmljs/parser/gen-parser.sh 1 addition, 1 deletionsrc/libs/qmljs/parser/gen-parser.sh
- src/libs/qmljs/parser/qmljs.g 42 additions, 18 deletionssrc/libs/qmljs/parser/qmljs.g
- src/libs/qmljs/parser/qmljsparser.cpp 6 additions, 5 deletionssrc/libs/qmljs/parser/qmljsparser.cpp
- src/libs/utils/wizard.cpp 9 additions, 3 deletionssrc/libs/utils/wizard.cpp
- src/libs/utils/wizard.h 5 additions, 4 deletionssrc/libs/utils/wizard.h
- src/plugins/coreplugin/dialogs/settingsdialog.cpp 2 additions, 1 deletionsrc/plugins/coreplugin/dialogs/settingsdialog.cpp
- src/plugins/coreplugin/editortoolbar.cpp 2 additions, 6 deletionssrc/plugins/coreplugin/editortoolbar.cpp
- src/plugins/coreplugin/editortoolbar.h 0 additions, 2 deletionssrc/plugins/coreplugin/editortoolbar.h
- src/plugins/coreplugin/fancyactionbar.cpp 0 additions, 52 deletionssrc/plugins/coreplugin/fancyactionbar.cpp
- src/plugins/coreplugin/fancyactionbar.h 0 additions, 10 deletionssrc/plugins/coreplugin/fancyactionbar.h
- src/plugins/cpaster/codepasterprotocol.cpp 5 additions, 11 deletionssrc/plugins/cpaster/codepasterprotocol.cpp
- src/plugins/cpaster/codepasterprotocol.h 2 additions, 5 deletionssrc/plugins/cpaster/codepasterprotocol.h
- src/plugins/cpaster/cpasterplugin.cpp 39 additions, 19 deletionssrc/plugins/cpaster/cpasterplugin.cpp
- src/plugins/cpaster/cpasterplugin.h 6 additions, 2 deletionssrc/plugins/cpaster/cpasterplugin.h
- src/plugins/cpaster/pastebindotcaprotocol.cpp 19 additions, 20 deletionssrc/plugins/cpaster/pastebindotcaprotocol.cpp
- src/plugins/cpaster/pastebindotcaprotocol.h 6 additions, 8 deletionssrc/plugins/cpaster/pastebindotcaprotocol.h
- src/plugins/cpaster/pastebindotcomprotocol.cpp 16 additions, 20 deletionssrc/plugins/cpaster/pastebindotcomprotocol.cpp
- src/plugins/cpaster/pastebindotcomprotocol.h 2 additions, 9 deletionssrc/plugins/cpaster/pastebindotcomprotocol.h
- src/plugins/cpaster/protocol.cpp 47 additions, 0 deletionssrc/plugins/cpaster/protocol.cpp
- src/plugins/cpaster/protocol.h 53 additions, 1 deletionsrc/plugins/cpaster/protocol.h
Loading
Please register or sign in to comment