Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Showing
- share/qtcreator/gdbmacros/gdbmacros.cpp 20 additions, 7 deletionsshare/qtcreator/gdbmacros/gdbmacros.cpp
- share/qtcreator/gdbmacros/gdbmacros.pro 1 addition, 2 deletionsshare/qtcreator/gdbmacros/gdbmacros.pro
- share/qtcreator/templates/qt4project/customwidgetwizard/tpl_collection.cpp 0 additions, 0 deletions...emplates/qt4project/customwidgetwizard/tpl_collection.cpp
- share/qtcreator/templates/qt4project/customwidgetwizard/tpl_collection.h 0 additions, 0 deletions.../templates/qt4project/customwidgetwizard/tpl_collection.h
- share/qtcreator/templates/qt4project/customwidgetwizard/tpl_plugin.pro 0 additions, 0 deletions...or/templates/qt4project/customwidgetwizard/tpl_plugin.pro
- share/qtcreator/templates/qt4project/customwidgetwizard/tpl_resources.qrc 0 additions, 0 deletions...templates/qt4project/customwidgetwizard/tpl_resources.qrc
- share/qtcreator/templates/qt4project/customwidgetwizard/tpl_single.cpp 0 additions, 0 deletions...or/templates/qt4project/customwidgetwizard/tpl_single.cpp
- share/qtcreator/templates/qt4project/customwidgetwizard/tpl_single.h 0 additions, 0 deletions...ator/templates/qt4project/customwidgetwizard/tpl_single.h
- share/qtcreator/templates/qt4project/customwidgetwizard/tpl_widget.cpp 0 additions, 0 deletions...or/templates/qt4project/customwidgetwizard/tpl_widget.cpp
- share/qtcreator/templates/qt4project/customwidgetwizard/tpl_widget.h 0 additions, 0 deletions...ator/templates/qt4project/customwidgetwizard/tpl_widget.h
- share/qtcreator/templates/qt4project/customwidgetwizard/tpl_widget_include.pri 0 additions, 0 deletions...ates/qt4project/customwidgetwizard/tpl_widget_include.pri
- share/qtcreator/templates/qt4project/customwidgetwizard/tpl_widget_lib.pro 0 additions, 0 deletions...emplates/qt4project/customwidgetwizard/tpl_widget_lib.pro
- share/qtcreator/translations/phrasebook_fr.qph 291 additions, 0 deletionsshare/qtcreator/translations/phrasebook_fr.qph
- share/qtcreator/translations/qtcreator_fr.ts 208 additions, 207 deletionsshare/qtcreator/translations/qtcreator_fr.ts
- src/libs/cplusplus/FastPreprocessor.cpp 12 additions, 0 deletionssrc/libs/cplusplus/FastPreprocessor.cpp
- src/libs/cplusplus/FastPreprocessor.h 1 addition, 2 deletionssrc/libs/cplusplus/FastPreprocessor.h
- src/libs/cplusplus/pp-engine.cpp 5 additions, 1 deletionsrc/libs/cplusplus/pp-engine.cpp
- src/plugins/coreplugin/sidebar.cpp 12 additions, 4 deletionssrc/plugins/coreplugin/sidebar.cpp
- src/plugins/coreplugin/sidebar.h 3 additions, 0 deletionssrc/plugins/coreplugin/sidebar.h
- src/plugins/debugger/debuggeractions.cpp 7 additions, 0 deletionssrc/plugins/debugger/debuggeractions.cpp
Loading
Please register or sign in to comment