Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs

This commit is contained in:
Thomas Gubler 2013-11-17 13:42:20 +01:00
commit 980e2bbac2
1 changed files with 1 additions and 1 deletions

View File

@ -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) {