Merge branch 'master' of github.com:PX4/Firmware into statemachine_docs

This commit is contained in:
Lorenz Meier
2013-01-26 12:07:01 +01:00
284 changed files with 19301 additions and 2480 deletions
+6 -2
View File
@@ -1,12 +1,16 @@
.built
*.context
*.bdat
*.pdat
.depend
.updated
.config
.config-e
.version
.project
.cproject
apps/namedapp/namedapp_list.h
apps/namedapp/namedapp_proto.h
apps/builtin/builtin_list.h
apps/builtin/builtin_proto.h
Make.dep
*.pyc
*.o