aboutsummaryrefslogtreecommitdiff
path: root/unittests/.gitignore
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2014-12-29 08:00:12 +0100
committerThomas Gubler <thomasgubler@gmail.com>2014-12-29 08:00:12 +0100
commitf4e0dc2857da7a8b42b7439ae57310b23c902cd9 (patch)
treed31b6697458c5f54672ea6b5bbc3a267e6fa1be5 /unittests/.gitignore
parentacb4844939f971a1a33515316f5e6c7c8f668f12 (diff)
parent22f744f0e17f83a706998381d1977c9cb24d457a (diff)
downloadpx4-firmware-f4e0dc2857da7a8b42b7439ae57310b23c902cd9.tar.gz
px4-firmware-f4e0dc2857da7a8b42b7439ae57310b23c902cd9.tar.bz2
px4-firmware-f4e0dc2857da7a8b42b7439ae57310b23c902cd9.zip
Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts: .gitmodules
Diffstat (limited to 'unittests/.gitignore')
-rw-r--r--unittests/.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/unittests/.gitignore b/unittests/.gitignore
index 37e923b5e..aa316941f 100644
--- a/unittests/.gitignore
+++ b/unittests/.gitignore
@@ -1,6 +1,8 @@
./obj/*
+gtest_main.a
mixer_test
sf0x_test
sbus2_test
autodeclination_test
st24_test
+sample_unittest