diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-09-05 22:18:00 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-09-05 22:18:00 +0200 |
| commit | d74bea57ac9f47b56e7f8b1ba592489a94a969f0 (patch) | |
| tree | 7ee57eb395fbb6426916a330bf7f0193f5f99729 /makefiles | |
| parent | 7fa2b9c91aa3369fe56795f57171cb54d6d2b1fb (diff) | |
| parent | 373a74adb9abc218ca8084fc3f59c0e50daf9bf4 (diff) | |
| download | px4-firmware-d74bea57ac9f47b56e7f8b1ba592489a94a969f0.tar.gz px4-firmware-d74bea57ac9f47b56e7f8b1ba592489a94a969f0.tar.bz2 px4-firmware-d74bea57ac9f47b56e7f8b1ba592489a94a969f0.zip | |
Merge branch 'master' of github.com:PX4/Firmware into fixedwing_l1
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/config_px4fmu-v1_default.mk | 4 | ||||
| -rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk index ea73129db..7bb5dc62e 100644 --- a/makefiles/config_px4fmu-v1_default.mk +++ b/makefiles/config_px4fmu-v1_default.mk @@ -94,8 +94,8 @@ MODULES += modules/sdlog2 # # Unit tests # -MODULES += modules/unit_test -MODULES += modules/commander/commander_tests +#MODULES += modules/unit_test +#MODULES += modules/commander/commander_tests # # Library modules diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index f0acada7b..d9dab1a2c 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -89,8 +89,8 @@ MODULES += modules/sdlog2 # # Unit tests # -MODULES += modules/unit_test -MODULES += modules/commander/commander_tests +#MODULES += modules/unit_test +#MODULES += modules/commander/commander_tests # # Library modules |