Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into new_state_machine | Julian Oes | 2013-05-17 | 1 | -32/+38 |
| | | | | | | | Conflicts: src/drivers/px4io/px4io.cpp src/modules/commander/commander.c src/modules/commander/state_machine_helper.c | ||||
* | Moved multirotor controllers | Lorenz Meier | 2013-04-27 | 1 | -0/+485 |