Merged public master

This commit is contained in:
Lorenz Meier
2013-08-16 16:22:38 +02:00
28 changed files with 149 additions and 100 deletions

17
.gitignore vendored
View File

@@ -23,10 +23,13 @@ Firmware.sublime-workspace
Images/*.bin
Images/*.px4
mavlink/include/mavlink/v0.9/
NuttX
nuttx-configs/px4io-v2/src/.depend
nuttx-configs/px4io-v2/src/Make.dep
nuttx-configs/px4io-v2/src/libboard.a
nuttx-configs/px4io-v1/src/.depend
nuttx-configs/px4io-v1/src/Make.dep
nuttx-configs/px4io-v1/src/libboard.a
/nuttx-configs/px4io-v2/src/.depend
/nuttx-configs/px4io-v2/src/Make.dep
/nuttx-configs/px4io-v2/src/libboard.a
/nuttx-configs/px4io-v1/src/.depend
/nuttx-configs/px4io-v1/src/Make.dep
/nuttx-configs/px4io-v1/src/libboard.a
/NuttX
/Documentation/doxy.log
/Documentation/html/
/Documentation/doxygen*objdb*tmp