diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-25 09:48:15 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-25 09:48:15 +0100 |
| commit | 25af4b266ca48b183a1ad375856396f67d6ab30f (patch) | |
| tree | 64e031ec3747ab706e5ae8ed9fd052e12ee3248b /.gitignore | |
| parent | ad189cf7d69b8de16244b90d398e1d84ed6d0f4b (diff) | |
| parent | 9b535f6553944f3468bbec9203301623412524ad (diff) | |
| download | px4-firmware-25af4b266ca48b183a1ad375856396f67d6ab30f.tar.gz px4-firmware-25af4b266ca48b183a1ad375856396f67d6ab30f.tar.bz2 px4-firmware-25af4b266ca48b183a1ad375856396f67d6ab30f.zip | |
Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
.gitignore
src/lib/uavcan
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 9d9c3d383..096acb5b3 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ tags .ropeproject *.orig src/modules/uORB/topics/* +Firmware.zip |