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

Conflicts:
	.gitignore
	src/lib/uavcan
This commit is contained in:
Thomas Gubler
2014-12-25 09:48:15 +01:00
65 changed files with 21014 additions and 289 deletions

1
.gitignore vendored
View File

@@ -40,3 +40,4 @@ tags
.ropeproject
*.orig
src/modules/uORB/topics/*
Firmware.zip