Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into ros | Thomas Gubler | 2015-01-15 | 1 | -0/+1 |
| | | | | | Conflicts: src/platforms/px4_middleware.h | ||||
* | add actuator_controls_virtual_mc as msg, fix msg setup in CMakeList | Thomas Gubler | 2014-12-25 | 1 | -0/+4 |