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

7f147caf · pixhawk · a57eaf97 · 5c9159b6 · 7f147caf
Commit 7f147caf authored Jan 12, 2011 by pixhawk
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),