aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2013-11-17 13:42:20 +0100
committerThomas Gubler <thomasgubler@gmail.com>2013-11-17 13:42:20 +0100
commit980e2bbac2dd26776ea1867629165c2a8c00f9a3 (patch)
tree5ffeb0cb06f2bf460330df861b721becbf8f29d9
parentfefaab91cf3a67a9d2f66e94fdb2708709635095 (diff)
parent39634d100104b64f205b69017562b3ac549cf264 (diff)
downloadpx4-firmware-980e2bbac2dd26776ea1867629165c2a8c00f9a3.tar.gz
px4-firmware-980e2bbac2dd26776ea1867629165c2a8c00f9a3.tar.bz2
px4-firmware-980e2bbac2dd26776ea1867629165c2a8c00f9a3.zip
Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs
-rw-r--r--src/drivers/px4io/px4io.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/drivers/px4io/px4io.cpp b/src/drivers/px4io/px4io.cpp
index 08e697b9f..ef6ca04e9 100644
--- a/src/drivers/px4io/px4io.cpp
+++ b/src/drivers/px4io/px4io.cpp
@@ -2530,7 +2530,7 @@ px4io_main(int argc, char *argv[])
}
PX4IO_Uploader *up;
- const char *fn[3];
+ const char *fn[4];
/* work out what we're uploading... */
if (argc > 2) {