aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorTrent Lukaczyk <aerialhedgehog@gmail.com>2015-02-05 20:19:04 -0800
committerTrent Lukaczyk <aerialhedgehog@gmail.com>2015-02-05 20:19:04 -0800
commit531eaa231486c6af46394f6842d420447cb0ee0e (patch)
treee7a90d8c50d700a2b7aff05c5a545162810d4967 /.gitignore
parent6798aee13a5bb885966960cdba6ab57b14278ab0 (diff)
parent7e6198b3dd517e1158431c8344c5912a6c28b363 (diff)
downloadpx4-firmware-531eaa231486c6af46394f6842d420447cb0ee0e.tar.gz
px4-firmware-531eaa231486c6af46394f6842d420447cb0ee0e.tar.bz2
px4-firmware-531eaa231486c6af46394f6842d420447cb0ee0e.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore5
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 8ea2698e7..611325444 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@
.~lock.*
Archives/*
Build/*
+build/*
core
cscope.out
Firmware.sublime-workspace
@@ -38,6 +39,10 @@ tags
.pydevproject
.ropeproject
*.orig
+src/modules/uORB/topics/*
+src/platforms/nuttx/px4_messages/*
+src/platforms/ros/px4_messages/*
Firmware.zip
unittests/build
*.generated.h
+.vagrant