Merge pull request #8068 from Hinsbart/fix_ps_cross_2.1

InputMap: Rename joypad button "PS X" to "PS Cross". [2.1]

tools/editor/project_settings.cpp

@@ -38,7 +38,7 @@
 ProjectSettings *ProjectSettings::singleton=NULL;
 
 static const char* _button_names[JOY_BUTTON_MAX]={
-"PS X, XBox A, Nintendo B",
+"PS Cross, XBox A, Nintendo B",
 "PS Circle, XBox B, Nintendo A",
 "PS Square, XBox X, Nintendo Y",
 "PS Triangle, XBox Y, Nintendo X",