diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-11 13:37:08 +0200 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-11 13:37:08 +0200 |
commit | af1ad04c2390f69d9f11394f872a0086206d044e (patch) | |
tree | 0a392555bc6d1a5098b3d4a89587463427ccf64d /.gitignore | |
parent | 801d1d31983d404d5ebe8f5750359f2d8c7fdf43 (diff) | |
parent | 5abdacc9079e4ebe5f2e3d855f3c5241adecef37 (diff) | |
download | px4-firmware-af1ad04c2390f69d9f11394f872a0086206d044e.tar.gz px4-firmware-af1ad04c2390f69d9f11394f872a0086206d044e.tar.bz2 px4-firmware-af1ad04c2390f69d9f11394f872a0086206d044e.zip |
Merge remote-tracking branch 'origin/master' into geo
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index afd63e06a..8b09e4783 100644 --- a/.gitignore +++ b/.gitignore @@ -29,7 +29,6 @@ mavlink/include/mavlink/v0.9/ /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 |