    Fixes:    correct name for gdmacros.cpp hint
    Fixes:    correct name for gdmacros.cpp hint

Conflicts:

	src/plugins/debugger/gdbengine.cpp

pcacjr/qt-creator,dmik/qt-creator-os2,pcacjr/qt-creator,martyone/sailfish-qtcreator,syntheticpp/qt-creator,amyvmiwei/qt-creator,Distrotech/qtcreator,omniacreator/qtcreator,dmik/qt-creator-os2,maui-packages/qt-creator,enricoros/k-qt-creator-inspector,darksylinc/qt-creator,pcacjr/qt-creator,xianian/qt-creator,sandsmark/qtcreator-minimap,kuba1/qtcreator,Distrotech/qtcreator,yinyunqiao/qtcreator,omniacreator/qtcreator,martyone/sailfish-qtcreator,xianian/qt-creator,renatofilho/QtCreator,malikcjm/qtcreator,amyvmiwei/qt-creator,KDE/android-qt-creator,KDE/android-qt-creator,duythanhphan/qt-creator,kuba1/qtcreator,syntheticpp/qt-creator,maui-packages/qt-creator,kuba1/qtcreator,danimo/qt-creator,danimo/qt-creator,farseerri/git_code,omniacreator/qtcreator,KDAB/KDAB-Creator,kuba1/qtcreator,ostash/qt-creator-i18n-uk,colede/qtcreator,azat/qtcreator,farseerri/git_code,AltarBeastiful/qt-creator,richardmg/qtcreator,bakaiadam/collaborative_qt_creator,hdweiss/qt-creator-visualizer,syntheticpp/qt-creator,colede/qtcreator,richardmg/qtcreator,farseerri/git_code,bakaiadam/collaborative_qt_creator,bakaiadam/collaborative_qt_creator,farseerri/git_code,AltarBeastiful/qt-creator,hdweiss/qt-creator-visualizer,yinyunqiao/qtcreator,KDE/android-qt-creator,darksylinc/qt-creator,enricoros/k-qt-creator-inspector,farseerri/git_code,KDE/android-qt-creator,maui-packages/qt-creator,malikcjm/qtcreator,farseerri/git_code,sandsmark/qtcreator-minimap,KDE/android-qt-creator,amyvmiwei/qt-creator,colede/qtcreator,azat/qtcreator,kuba1/qtcreator,KDAB/KDAB-Creator,maui-packages/qt-creator,darksylinc/qt-creator,amyvmiwei/qt-creator,darksylinc/qt-creator,pcacjr/qt-creator,KDAB/KDAB-Creator,Distrotech/qtcreator,syntheticpp/qt-creator,azat/qtcreator,ostash/qt-creator-i18n-uk,renatofilho/QtCreator,ostash/qt-creator-i18n-uk,renatofilho/QtCreator,ostash/qt-creator-i18n-uk,richardmg/qtcreator,yinyunqiao/qtcreator,amyvmiwei/qt-creator,duythanhphan/qt-creator,colede/qtcreator,KDAB/KDAB-Creator,Distrotech/qtcreator,sandsmark/qtcreator-minimap,sandsmark/qtcreator-minimap,xianian/qt-creator,richardmg/qtcreator,Distrotech/qtcreator,danimo/qt-creator,yinyunqiao/qtcreator,syntheticpp/qt-creator,enricoros/k-qt-creator-inspector,jonnor/qt-creator,azat/qtcreator,danimo/qt-creator,xianian/qt-creator,xianian/qt-creator,xianian/qt-creator,jonnor/qt-creator,farseerri/git_code,martyone/sailfish-qtcreator,omniacreator/qtcreator,malikcjm/qtcreator,colede/qtcreator,bakaiadam/collaborative_qt_creator,danimo/qt-creator,dmik/qt-creator-os2,darksylinc/qt-creator,martyone/sailfish-qtcreator,duythanhphan/qt-creator,azat/qtcreator,dmik/qt-creator-os2,kuba1/qtcreator,colede/qtcreator,KDE/android-qt-creator,bakaiadam/collaborative_qt_creator,martyone/sailfish-qtcreator,colede/qtcreator,danimo/qt-creator,bakaiadam/collaborative_qt_creator,Distrotech/qtcreator,yinyunqiao/qtcreator,AltarBeastiful/qt-creator,danimo/qt-creator,pcacjr/qt-creator,richardmg/qtcreator,omniacreator/qtcreator,Distrotech/qtcreator,enricoros/k-qt-creator-inspector,amyvmiwei/qt-creator,dmik/qt-creator-os2,sandsmark/qtcreator-minimap,sandsmark/qtcreator-minimap,bakaiadam/collaborative_qt_creator,duythanhphan/qt-creator,duythanhphan/qt-creator,ostash/qt-creator-i18n-uk,martyone/sailfish-qtcreator,darksylinc/qt-creator,pcacjr/qt-creator,ostash/qt-creator-i18n-uk,martyone/sailfish-qtcreator,azat/qtcreator,jonnor/qt-creator,maui-packages/qt-creator,martyone/sailfish-qtcreator,xianian/qt-creator,syntheticpp/qt-creator,malikcjm/qtcreator,KDAB/KDAB-Creator,duythanhphan/qt-creator,enricoros/k-qt-creator-inspector,richardmg/qtcreator,maui-packages/qt-creator,KDE/android-qt-creator,syntheticpp/qt-creator,renatofilho/QtCreator,jonnor/qt-creator,enricoros/k-qt-creator-inspector,yinyunqiao/qtcreator,dmik/qt-creator-os2,AltarBeastiful/qt-creator,hdweiss/qt-creator-visualizer,kuba1/qtcreator,KDAB/KDAB-Creator,amyvmiwei/qt-creator,richardmg/qtcreator,jonnor/qt-creator,darksylinc/qt-creator,dmik/qt-creator-os2,ostash/qt-creator-i18n-uk,malikcjm/qtcreator,enricoros/k-qt-creator-inspector,omniacreator/qtcreator,omniacreator/qtcreator,jonnor/qt-creator,xianian/qt-creator,hdweiss/qt-creator-visualizer,duythanhphan/qt-creator,malikcjm/qtcreator,AltarBeastiful/qt-creator,AltarBeastiful/qt-creator,kuba1/qtcreator,martyone/sailfish-qtcreator,farseerri/git_code,renatofilho/QtCreator,maui-packages/qt-creator,kuba1/qtcreator,darksylinc/qt-creator,xianian/qt-creator,pcacjr/qt-creator,yinyunqiao/qtcreator,hdweiss/qt-creator-visualizer,danimo/qt-creator,malikcjm/qtcreator,KDE/android-qt-creator,AltarBeastiful/qt-creator,renatofilho/QtCreator,danimo/qt-creator,AltarBeastiful/qt-creator,amyvmiwei/qt-creator,hdweiss/qt-creator-visualizer