diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2014-01-17 09:50:22 +0100 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-01-17 09:50:22 +0100 |
commit | 73546b6645c5715ba0cecf00899632bf861321c9 (patch) | |
tree | d0eb82de70d6cc02ef0e6a3ccfd89525478ab8e5 /src/systemcmds/tests/tests.h | |
parent | 14c0fae175452da6e28ffc20b265de621a2430ba (diff) | |
parent | e691bab71a69216273fdc253695ef849671af9a7 (diff) | |
download | px4-firmware-73546b6645c5715ba0cecf00899632bf861321c9.tar.gz px4-firmware-73546b6645c5715ba0cecf00899632bf861321c9.tar.bz2 px4-firmware-73546b6645c5715ba0cecf00899632bf861321c9.zip |
Merge remote-tracking branch 'upstream/master' into navigator_new
Conflicts:
makefiles/config_px4fmu-v1_backside.mk
src/modules/commander/commander.cpp
src/modules/sdlog2/sdlog2.c
Diffstat (limited to 'src/systemcmds/tests/tests.h')
-rw-r--r-- | src/systemcmds/tests/tests.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/systemcmds/tests/tests.h b/src/systemcmds/tests/tests.h index bec13bd30..223edc14a 100644 --- a/src/systemcmds/tests/tests.h +++ b/src/systemcmds/tests/tests.h @@ -109,7 +109,9 @@ extern int test_bson(int argc, char *argv[]); extern int test_file(int argc, char *argv[]); extern int test_mixer(int argc, char *argv[]); extern int test_rc(int argc, char *argv[]); +extern int test_conv(int argc, char *argv[]); extern int test_mount(int argc, char *argv[]); +extern int test_mtd(int argc, char *argv[]); __END_DECLS |