diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2015-02-03 20:07:55 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-02-03 20:07:55 +0100 |
| commit | dc46736eadac43527f875b281cc1f50032d36066 (patch) | |
| tree | 5ee20f8423847161b624fd4f1e943d5a1608d171 /.gitignore | |
| parent | 3e7faa6018dbff54860304a2e1a35d853160ef64 (diff) | |
| parent | d441d38677eb78d1e599973dd1e993d3af1af218 (diff) | |
| download | px4-firmware-dc46736eadac43527f875b281cc1f50032d36066.tar.gz px4-firmware-dc46736eadac43527f875b281cc1f50032d36066.tar.bz2 px4-firmware-dc46736eadac43527f875b281cc1f50032d36066.zip | |
Merge ROS into master
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 5 |
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 |