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

This commit is contained in:
Thomas Gubler
2015-01-06 08:56:39 +01:00
11 changed files with 285 additions and 279 deletions

1
.gitignore vendored
View File

@@ -42,3 +42,4 @@ tags
src/modules/uORB/topics/*
Firmware.zip
unittests/build
*.generated.h