diff options
| author | Julian Oes <julian@oes.ch> | 2013-05-17 11:24:02 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-05-17 11:24:02 +0200 |
| commit | f5c157e74df12a0cb36b7d27cdad9828d96cc534 (patch) | |
| tree | 3f758990921a7b52df8afe5131a8298b1141b6f4 /nuttx/configs/px4io/io/appconfig | |
| parent | 80e8eeab2931e79e31adb17c93f5794e666c5763 (diff) | |
| parent | fa816d0fd65da461fd5bf8803cf00caebaf23c5c (diff) | |
| download | px4-firmware-f5c157e74df12a0cb36b7d27cdad9828d96cc534.tar.gz px4-firmware-f5c157e74df12a0cb36b7d27cdad9828d96cc534.tar.bz2 px4-firmware-f5c157e74df12a0cb36b7d27cdad9828d96cc534.zip | |
Merge remote-tracking branch 'upstream/master' into new_state_machine
Conflicts:
src/drivers/px4io/px4io.cpp
src/modules/commander/commander.c
src/modules/commander/state_machine_helper.c
Diffstat (limited to 'nuttx/configs/px4io/io/appconfig')
| -rw-r--r-- | nuttx/configs/px4io/io/appconfig | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/nuttx/configs/px4io/io/appconfig b/nuttx/configs/px4io/io/appconfig index 628607a51..48a41bcdb 100644 --- a/nuttx/configs/px4io/io/appconfig +++ b/nuttx/configs/px4io/io/appconfig @@ -30,11 +30,3 @@ # POSSIBILITY OF SUCH DAMAGE. # ############################################################################ - -CONFIGURED_APPS += drivers/boards/px4io -CONFIGURED_APPS += drivers/stm32 - -CONFIGURED_APPS += px4io - -# Mixer library from systemlib -CONFIGURED_APPS += systemlib/mixer |