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

Browse Source

Conflicts:
	.gitignore
	src/lib/uavcan

...

This commit is contained in:

Thomas Gubler

2014-12-25 09:48:15 +01:00

parent ad189cf7d6 9b535f6553

commit 25af4b266c

65 changed files with 21014 additions and 289 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

Submodule

+1

Submodule src/lib/uavcan added at 6a19364898