Merge branch 'experimental' of pixhawk.ethz.ch:qgroundcontrol into experimental

14 years ago · 5c9159b622
1 changed files with 2 additions and 1 deletions
--- a/src/ui/designer/QGCActionButton.cc
+++ b/src/ui/designer/QGCActionButton.cc
@ -39,7 +39,8 @@ const char* kActionLabels[MAV_ACTION_NB] =
				@@ -39,7 +39,8 @@ const char* kActionLabels[MAV_ACTION_NB] =
 "GET IMAGE",
 "START VIDEO",
 "STOP VIDEO",
- "RESET MAP"};
+ "RESET MAP",
+ "RESET PLAN"};

 QGCActionButton::QGCActionButton(QWidget *parent) :
    QGCToolWidgetItem("Button", parent),