Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Showing
- 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/quickopen/quickopenplugin.cpp 9 additions, 1 deletionsrc/plugins/quickopen/quickopenplugin.cpp
- src/plugins/texteditor/basetexteditor.cpp 233 additions, 166 deletionssrc/plugins/texteditor/basetexteditor.cpp
- src/plugins/texteditor/basetexteditor.h 2 additions, 3 deletionssrc/plugins/texteditor/basetexteditor.h
- src/plugins/texteditor/basetexteditor_p.h 4 additions, 4 deletionssrc/plugins/texteditor/basetexteditor_p.h
- src/plugins/texteditor/displaysettings.cpp 2 additions, 2 deletionssrc/plugins/texteditor/displaysettings.cpp
- src/plugins/texteditor/fontsettingspage.cpp 2 additions, 2 deletionssrc/plugins/texteditor/fontsettingspage.cpp
- src/plugins/texteditor/texteditorconstants.h 1 addition, 0 deletionssrc/plugins/texteditor/texteditorconstants.h
- src/plugins/texteditor/texteditorsettings.cpp 1 addition, 0 deletionssrc/plugins/texteditor/texteditorsettings.cpp
- tests/manual/gdbdebugger/simple/app.cpp 14 additions, 2 deletionstests/manual/gdbdebugger/simple/app.cpp
Loading
Please register or sign in to comment