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

5c9159b6 · lm · 5f497743 · dbac4f15 · 5c9159b6
Commit 5c9159b6 authored Jan 11, 2011 by lm
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

QGCActionButton.cc src/ui/designer/QGCActionButton.cc +2 -1

No files found.
--- a/src/ui/designer/QGCActionButton.cc
+++ b/src/ui/designer/QGCActionButton.cc
@@ -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),