diff options
| author | Julian Oes <julian@oes.ch> | 2013-07-08 10:31:32 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-07-08 10:31:32 +0200 |
| commit | 88389ea2554c6f56a4fdd86cdd86a1e7b6affc21 (patch) | |
| tree | 3ef98ded43e5f3a2cdc30a836a3a7329fe5757bb /Images | |
| parent | 76346bfe19c816491a6982abfa10f48cd9d258f6 (diff) | |
| parent | cf2dbdf9a1ae06c7d0e0a7963916a3709a1bc075 (diff) | |
| download | px4-firmware-88389ea2554c6f56a4fdd86cdd86a1e7b6affc21.tar.gz px4-firmware-88389ea2554c6f56a4fdd86cdd86a1e7b6affc21.tar.bz2 px4-firmware-88389ea2554c6f56a4fdd86cdd86a1e7b6affc21.zip | |
Merge branch 'master' into new_state_machine
compiling again
Conflicts:
src/modules/fixedwing_att_control/fixedwing_att_control_att.c
src/modules/fixedwing_att_control/fixedwing_att_control_rate.c
src/modules/fixedwing_pos_control/fixedwing_pos_control_main.c
src/modules/mavlink/orb_listener.c
src/modules/multirotor_att_control/multirotor_attitude_control.c
src/modules/multirotor_att_control/multirotor_rate_control.c
src/modules/systemlib/pid/pid.c
src/modules/systemlib/pid/pid.h
src/modules/uORB/objects_common.cpp
Diffstat (limited to 'Images')
| -rw-r--r-- | Images/px4fmu-v1.prototype (renamed from Images/px4fmu.prototype) | 0 | ||||
| -rw-r--r-- | Images/px4io-v1.prototype (renamed from Images/px4io.prototype) | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/Images/px4fmu.prototype b/Images/px4fmu-v1.prototype index da88f8490..da88f8490 100644 --- a/Images/px4fmu.prototype +++ b/Images/px4fmu-v1.prototype diff --git a/Images/px4io.prototype b/Images/px4io-v1.prototype index d00b7e5d9..d00b7e5d9 100644 --- a/Images/px4io.prototype +++ b/Images/px4io-v1.prototype |