diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-07 14:28:23 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-07 14:28:23 +0200 |
commit | de5bdbb8638b1911e9956b49935071349f32ebb7 (patch) | |
tree | 5fce27d92f17189ffd29da626824b9bce8a27a13 /.gitignore | |
parent | be728d189e4b1b04de5a0b45710e08effcf50b8b (diff) | |
parent | 2569338919acda9b3bc64f4a02e2014f621980c4 (diff) | |
download | px4-firmware-de5bdbb8638b1911e9956b49935071349f32ebb7.tar.gz px4-firmware-de5bdbb8638b1911e9956b49935071349f32ebb7.tar.bz2 px4-firmware-de5bdbb8638b1911e9956b49935071349f32ebb7.zip |
Merged master into uavcan
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 8c3bb1bb5..2d39863bf 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,5 @@ tags .tags_sorted_by_file .pydevproject /uavcan +.ropeproject +*.orig |