Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
No related branches found
No related tags found
Showing
- doc/qtcreator.qdoc 2 additions, 2 deletionsdoc/qtcreator.qdoc
- doc/qtcreator.qdocconf 5 additions, 5 deletionsdoc/qtcreator.qdocconf
- share/qtcreator/translations/qtcreator_fr.ts 212 additions, 213 deletionsshare/qtcreator/translations/qtcreator_fr.ts
- src/app/Info.plist 2 additions, 2 deletionssrc/app/Info.plist
- src/app/app.pro 1 addition, 1 deletionsrc/app/app.pro
- src/app/main.cpp 37 additions, 1 deletionsrc/app/main.cpp
- src/plugins/bineditor/BinEditor.pluginspec 3 additions, 3 deletionssrc/plugins/bineditor/BinEditor.pluginspec
- src/plugins/bineditor/bineditor.cpp 112 additions, 46 deletionssrc/plugins/bineditor/bineditor.cpp
- src/plugins/bineditor/bineditor.h 12 additions, 6 deletionssrc/plugins/bineditor/bineditor.h
- src/plugins/bineditor/bineditorplugin.cpp 73 additions, 49 deletionssrc/plugins/bineditor/bineditorplugin.cpp
- src/plugins/bookmarks/Bookmarks.pluginspec 4 additions, 4 deletionssrc/plugins/bookmarks/Bookmarks.pluginspec
- src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec 5 additions, 5 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/ieditor.h 1 addition, 0 deletionssrc/plugins/coreplugin/editormanager/ieditor.h
- src/plugins/coreplugin/mainwindow.cpp 7 additions, 2 deletionssrc/plugins/coreplugin/mainwindow.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/cppeditor/cpphighlighter.cpp 3 additions, 1 deletionsrc/plugins/cppeditor/cpphighlighter.cpp
- src/plugins/cpptools/CppTools.pluginspec 4 additions, 4 deletionssrc/plugins/cpptools/CppTools.pluginspec
Loading
Please register or sign in to comment