Commits

John Hsu committed 5911df6 Merge

Merged in model_pose_reset_gazebo_1.2 (pull request #153)

Comments (0)

Files changed (1)

gazebo/gui/MainWindow.cc

   connect(g_newModelAct, SIGNAL(triggered()), this, SLOT(NewModel()));
 
   g_resetModelsAct = new QAction(tr("&Reset Model Poses"), this);
-  g_resetModelsAct->setShortcut(tr("Ctrl+Shift-R"));
+  g_resetModelsAct->setShortcut(tr("Ctrl+Shift+R"));
   g_resetModelsAct->setStatusTip(tr("Reset model poses"));
   connect(g_resetModelsAct, SIGNAL(triggered()), this,
     SLOT(OnResetModelOnly()));