Commit Graph

2 Commits

Author SHA1 Message Date
Thomas Gubler 96db9e8188 Merge remote-tracking branch 'upstream/master' into ros
Conflicts:
	src/platforms/px4_middleware.h
2015-01-15 12:42:28 +01:00
Thomas Gubler 4567512d7a add actuator_controls_virtual_mc as msg, fix msg setup in CMakeList 2014-12-25 10:01:20 +01:00