Merge remote-tracking branch 'upstream/master' into ros

Browse Source

Conflicts:
	src/platforms/px4_middleware.h

...

This commit is contained in:

Thomas Gubler

2015-01-15 12:42:28 +01:00

parent e60c1a842c e62bd37e73

commit 96db9e8188

26 changed files with 351 additions and 283 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

src/lib/uavcan

+1 -1

Submodule src/lib/uavcan updated: 1efd244275...c4c45b995f