forked from qt-creator/qt-creator
Conflicts: share/qtcreator/gdbmacros/dumper.py share/qtcreator/gdbmacros/gdbmacros.py src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
Conflicts: share/qtcreator/gdbmacros/dumper.py share/qtcreator/gdbmacros/gdbmacros.py src/plugins/projectexplorer/customwizard/customwizardparameters.cpp