Merge remote branch 'origin/2.0'
Conflicts: share/qtcreator/gdbmacros/dumper.py share/qtcreator/gdbmacros/gdbmacros.py src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
Showing
- share/qtcreator/gdbmacros/dumper.py 7 additions, 0 deletionsshare/qtcreator/gdbmacros/dumper.py
- share/qtcreator/gdbmacros/gdbmacros.py 2 additions, 2 deletionsshare/qtcreator/gdbmacros/gdbmacros.py
- share/qtcreator/translations/qtcreator_cs.ts 1 addition, 1 deletionshare/qtcreator/translations/qtcreator_cs.ts
- share/qtcreator/translations/qtcreator_de.ts 1 addition, 1 deletionshare/qtcreator/translations/qtcreator_de.ts
- share/qtcreator/translations/qtcreator_fr.ts 1 addition, 1 deletionshare/qtcreator/translations/qtcreator_fr.ts
- share/qtcreator/translations/qtcreator_ja.ts 1 addition, 1 deletionshare/qtcreator/translations/qtcreator_ja.ts
- share/qtcreator/translations/qtcreator_pl.ts 1 addition, 1 deletionshare/qtcreator/translations/qtcreator_pl.ts
- share/qtcreator/translations/qtcreator_ru.ts 1 addition, 1 deletionshare/qtcreator/translations/qtcreator_ru.ts
- share/qtcreator/translations/qtcreator_sl.ts 1 addition, 1 deletionshare/qtcreator/translations/qtcreator_sl.ts
- share/qtcreator/translations/qtcreator_zh_CN.ts 22607 additions, 0 deletionsshare/qtcreator/translations/qtcreator_zh_CN.ts
- share/qtcreator/translations/translations.pro 1 addition, 1 deletionshare/qtcreator/translations/translations.pro
- src/plugins/designer/codemodelhelpers.cpp 1 addition, 1 deletionsrc/plugins/designer/codemodelhelpers.cpp
- src/plugins/projectexplorer/customwizard/customwizard.cpp 7 additions, 2 deletionssrc/plugins/projectexplorer/customwizard/customwizard.cpp
- src/plugins/projectexplorer/customwizard/customwizardparameters.cpp 21 additions, 12 deletions...s/projectexplorer/customwizard/customwizardparameters.cpp
- src/plugins/projectexplorer/customwizard/customwizardparameters.h 6 additions, 4 deletions...ins/projectexplorer/customwizard/customwizardparameters.h
Loading
Please register or sign in to comment