Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
No related branches found
No related tags found
Showing
- doc/api/qtcreator-api.qdoc 95 additions, 3 deletionsdoc/api/qtcreator-api.qdoc
- doc/api/qtcreator-api.qdocconf 4 additions, 2 deletionsdoc/api/qtcreator-api.qdocconf
- doc/doc.pri 2 additions, 0 deletionsdoc/doc.pri
- share/qtcreator/translations/qtcreator_de.ts 1029 additions, 902 deletionsshare/qtcreator/translations/qtcreator_de.ts
- share/qtcreator/translations/qtcreator_ja.ts 405 additions, 343 deletionsshare/qtcreator/translations/qtcreator_ja.ts
- src/plugins/coreplugin/actionmanager/command.cpp 0 additions, 4 deletionssrc/plugins/coreplugin/actionmanager/command.cpp
- src/plugins/coreplugin/actionmanager/commandsfile.cpp 0 additions, 1 deletionsrc/plugins/coreplugin/actionmanager/commandsfile.cpp
- src/plugins/coreplugin/basemode.cpp 0 additions, 1 deletionsrc/plugins/coreplugin/basemode.cpp
- src/plugins/coreplugin/baseview.cpp 0 additions, 75 deletionssrc/plugins/coreplugin/baseview.cpp
- src/plugins/coreplugin/coreplugin.pro 5 additions, 7 deletionssrc/plugins/coreplugin/coreplugin.pro
- src/plugins/coreplugin/dialogs/ioptionspage.h 0 additions, 15 deletionssrc/plugins/coreplugin/dialogs/ioptionspage.h
- src/plugins/coreplugin/editmode.cpp 1 addition, 1 deletionsrc/plugins/coreplugin/editmode.cpp
- src/plugins/coreplugin/editormanager/ieditor.h 2 additions, 27 deletionssrc/plugins/coreplugin/editormanager/ieditor.h
- src/plugins/coreplugin/filemanager.cpp 2 additions, 3 deletionssrc/plugins/coreplugin/filemanager.cpp
- src/plugins/coreplugin/welcomemode.cpp 1 addition, 1 deletionsrc/plugins/coreplugin/welcomemode.cpp
- src/plugins/coreplugin/welcomemode.ui 2 additions, 2 deletionssrc/plugins/coreplugin/welcomemode.ui
- src/plugins/find/findplugin.cpp 14 additions, 0 deletionssrc/plugins/find/findplugin.cpp
- src/plugins/find/findtoolbar.cpp 1 addition, 1 deletionsrc/plugins/find/findtoolbar.cpp
- src/plugins/projectexplorer/projectexplorer.cpp 2 additions, 2 deletionssrc/plugins/projectexplorer/projectexplorer.cpp
- src/plugins/projectexplorer/qtversionmanager.cpp 2 additions, 2 deletionssrc/plugins/projectexplorer/qtversionmanager.cpp
Loading
Please register or sign in to comment