Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Showing
- doc/qtcreator-texteditor-completion.png 0 additions, 0 deletionsdoc/qtcreator-texteditor-completion.png
- doc/qtcreator-texteditor-fonts.png 0 additions, 0 deletionsdoc/qtcreator-texteditor-fonts.png
- doc/qtcreator-texteditor-general.png 0 additions, 0 deletionsdoc/qtcreator-texteditor-general.png
- doc/qtcreator.qdoc 36 additions, 22 deletionsdoc/qtcreator.qdoc
- src/plugins/bineditor/BinEditor.pluginspec 1 addition, 1 deletionsrc/plugins/bineditor/BinEditor.pluginspec
- src/plugins/bookmarks/Bookmarks.pluginspec 1 addition, 1 deletionsrc/plugins/bookmarks/Bookmarks.pluginspec
- src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec 1 addition, 1 deletion...lugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
- src/plugins/coreplugin/Core.pluginspec 1 addition, 1 deletionsrc/plugins/coreplugin/Core.pluginspec
- src/plugins/coreplugin/core.qrc 4 additions, 0 deletionssrc/plugins/coreplugin/core.qrc
- src/plugins/coreplugin/html/images/btn_feedback.png 0 additions, 0 deletionssrc/plugins/coreplugin/html/images/btn_feedback.png
- src/plugins/coreplugin/html/images/btn_feedback_hover.png 0 additions, 0 deletionssrc/plugins/coreplugin/html/images/btn_feedback_hover.png
- src/plugins/coreplugin/html/images/feedback-bar-background.png 0 additions, 0 deletions...lugins/coreplugin/html/images/feedback-bar-background.png
- src/plugins/coreplugin/html/images/feedback-text.png 0 additions, 0 deletionssrc/plugins/coreplugin/html/images/feedback-text.png
- src/plugins/coreplugin/html/images/nokia_logo.png 0 additions, 0 deletionssrc/plugins/coreplugin/html/images/nokia_logo.png
- src/plugins/coreplugin/html/images/qt_logo.png 0 additions, 0 deletionssrc/plugins/coreplugin/html/images/qt_logo.png
- src/plugins/coreplugin/html/qt.css 29 additions, 3 deletionssrc/plugins/coreplugin/html/qt.css
- src/plugins/coreplugin/html/welcome.html 6 additions, 0 deletionssrc/plugins/coreplugin/html/welcome.html
- src/plugins/cpaster/CodePaster.pluginspec 1 addition, 1 deletionsrc/plugins/cpaster/CodePaster.pluginspec
- src/plugins/cpaster/cpasterplugin.cpp 21 additions, 5 deletionssrc/plugins/cpaster/cpasterplugin.cpp
- src/plugins/cpaster/cpasterplugin.h 1 addition, 0 deletionssrc/plugins/cpaster/cpasterplugin.h
Loading
Please register or sign in to comment